bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维修

This commit is contained in:
hayu 2025-06-15 12:11:25 +08:00
parent 03d2c2f1d1
commit 02ae3b6c9c
6 changed files with 167 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
View File

@ -108,6 +108,26 @@ public class RepairController extends BaseController {
return AjaxResult.success(list);
}
/**
* 获取维修任务机具列表--三级页面详情列表--编码
*/
@ApiOperation(value = "获取维修任务机具列表--三级页面详情列表--编码")
@GetMapping("/getRepairCodeList")
public AjaxResult getRepairCodeList(RepairTaskDetails bean) {
List<RepairTaskDetails> list = service.getRepairCodeList(bean);
return AjaxResult.success(list);
}
/**
* 查询试验记录表数据
*/
@ApiOperation(value = "查询试验记录表数据")
@GetMapping("/getTestRecordData")
public AjaxResult getTestRecordData(RepairTaskDetails bean) {
List<RepairTaskDetails> list = service.getTestRecordData(bean);
return AjaxResult.success(list);
}
/**
* 查询维修单
*/

22
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
View File

@ -1,12 +1,14 @@
package com.bonus.material.repair.domain;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.material.ma.domain.PartType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List;
/**
* @author syruan
@ -73,6 +75,13 @@ public class RepairTaskDetails extends BaseEntity {
*/
@ApiModelProperty(value = "设备编码")
private String code;
/**
* 编码
*/
@ApiModelProperty(value = "设备编码")
private String maCode;
/**
* 维修总量
*/
@ -151,6 +160,19 @@ public class RepairTaskDetails extends BaseEntity {
@ApiModelProperty(value = "维修前报废总量")
private BigDecimal preScrapNum;
@ApiModelProperty("额定载荷")
private String ratedLoad;
@ApiModelProperty("试验载荷")
private String testLoad;
@ApiModelProperty("持荷时间")
private String holdingTime;
private String userName;
private List<PartType> partTypeList;
public RepairTaskDetails(Long taskId) {
this.taskId = taskId;
}

22
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java
View File

@ -1,5 +1,6 @@
package com.bonus.material.repair.mapper;
import com.bonus.material.ma.domain.PartType;
import com.bonus.material.repair.domain.*;
import com.bonus.material.repair.domain.vo.RepairDeviceVO;
import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
@ -291,4 +292,25 @@ public interface RepairMapper {
* @return
*/
int getCostCount(RepairApplyRecord repairApplyRecord);
/**
* 获取维修任务机具列表--三级页面详情列表--编码
* @param bean
* @return
*/
List<RepairTaskDetails> getRepairCodeList(RepairTaskDetails bean);
/**
* 查询试验记录表数据
* @param bean
* @return
*/
List<RepairTaskDetails> getTestRecordData(RepairTaskDetails bean);
/**
* 查询配件
* @param bean
* @return
*/
List<PartType> getPartData(RepairTaskDetails bean);
}

14
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java
View File

@ -120,4 +120,18 @@ public interface RepairService {
* @return
*/
List<RepairPartInfo> getLossPart(RepairPartInfo bean);
/**
* 获取维修任务机具列表--三级页面详情列表--编码
* @param bean
* @return
*/
List<RepairTaskDetails> getRepairCodeList(RepairTaskDetails bean);
/**
* 查询试验记录表数据
* @param bean
* @return
*/
List<RepairTaskDetails> getTestRecordData(RepairTaskDetails bean);
}

29
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -1287,6 +1287,35 @@ public class RepairServiceImpl implements RepairService {
}
}
@Override
public List<RepairTaskDetails> getRepairCodeList(RepairTaskDetails bean) {
try {
return repairMapper.getRepairCodeList(bean);
} catch (Exception e){
return new ArrayList<>();
}
}
@Override
public List<RepairTaskDetails> getTestRecordData(RepairTaskDetails bean) {
try {
//查询
List<RepairTaskDetails> list = repairMapper.getTestRecordData(bean);
if (list.size() > 0) {
for (RepairTaskDetails bean1 : list) {
bean1.setUserName(SecurityUtils.getUsername());
//查询配件列表
List<PartType> partList = repairMapper.getPartData(bean1);
bean1.setPartTypeList(partList);
}
}
return list;
} catch (Exception e) {
log.error("查询试验记录表", e.getMessage());
return new ArrayList<>();
}
}
/**
* 查询修试查询-维修配件查询列表
* @param dto

60
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
View File

@ -908,6 +908,66 @@
WHERE repair_id = #{id}
</select>
<select id="getRepairCodeList" resultType="com.bonus.material.repair.domain.RepairTaskDetails">
SELECT
rad.id as id,
rad.task_id as taskId,
rad.type_id as typeId,
rad.ma_id as maId,
mm.ma_code as code,
mt.type_name as type,
mt2.type_name as typeName
FROM
repair_apply_details rad
LEFT JOIN ma_machine mm on mm.ma_id=rad.ma_id
LEFT JOIN ma_type mt on mt.type_id=rad.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
WHERE
rad.task_id=#{taskId}
and rad.type_id=#{typeId}
and rad.is_ds=0
</select>
<select id="getTestRecordData" resultType="com.bonus.material.repair.domain.RepairTaskDetails">
SELECT
rad.id,
rad.type_id as typeId,
mt.type_name as type,
mt2.type_name as typeName,
CONCAT(bai.`code`, '-', rad.`level`) as `code`,
mm.ma_code as maCode,
su.user_name as repairer,
rad.update_time as createTime,
mt.rated_load as ratedLoad,
mt.test_load as testLoad,
mt.holding_time as holdingTime,
rad.scrap_num as scrapNum
FROM
repair_apply_details rad
LEFT JOIN ma_type mt on mt.type_id=rad.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
LEFT JOIN back_apply_info bai on bai.id=rad.back_id
LEFT JOIN ma_machine mm on mm.ma_id=rad.ma_id
LEFT JOIN sys_user su on su.user_id=rad.repairer
WHERE
rad.id=#{id}
</select>
<select id="getPartData" resultType="com.bonus.material.ma.domain.PartType">
<![CDATA[
SELECT rar.part_id as id,
mpt2.pa_name as partName
FROM repair_apply_record rar
LEFT JOIN repair_apply_details rad
on rad.task_id = rar.task_id and rad.type_id = rar.type_id and rad.ma_id <=> rar.ma_id
LEFT JOIN ma_part_type mpt on mpt.pa_id = rar.part_id
LEFT JOIN ma_part_type mpt2 on mpt2.pa_id = mpt.parent_id
WHERE rad.id = #{id}
and rar.is_ds = 0
]]>
</select>
<update id="updateRepairedAndScrapNum">
update
repair_apply_details