bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
mashuai 2025-04-14 18:03:14 +08:00
parent 0ba74afdd8
commit 219db99369
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
View File

@ -95,4 +95,7 @@ public class RepairPart {
private Long repairer;
@ApiModelProperty(value = "维修数量")
private int repairNum;
@ApiModelProperty(value = "维修方式（1内部2返厂3报废）")
private String repairType;
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
View File

@ -147,4 +147,6 @@ public interface RepairAuditDetailsMapper
int updateRepairCost(@Param("inputDetails")RepairAuditDetails inputDetails, @Param("status") String status);
List<RepairRecord> getPartDetailsList(RepairAuditDetails bean);
List<RepairPart> getRepartList(RepairAuditDetails bean);
}

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -192,6 +192,15 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
public List<RepairPart> getPartRecord(RepairAuditDetails repairAuditDetails) {
RepairAuditDetails bean = repairAuditDetailsMapper.getRepairId(repairAuditDetails);
List<RepairPart> list = repairAuditDetailsMapper.getPartRecord(bean);
if (CollectionUtils.isEmpty(list)) {
List<RepairPart> repartList = repairAuditDetailsMapper.getRepartList(bean);
if (CollectionUtils.isNotEmpty(repartList)) {
String repairType = repartList.get(0).getRepairType();
if ("2".equals(repairType) || "3".equals(repairType)) {
return repartList;
}
}
}
return list;
}

20
sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
View File

@ -490,5 +490,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and rad.ma_id = #{maId}
</if>
</select>
<select id="getRepartList" resultType="com.bonus.sgzb.material.domain.RepairPart">
select
part_num as partNum,
part_price as partCost,
part_type as partType,
part_name as partName,
remark as remark,
repair_type as repairType
from repair_apply_record rar
where 1=1
<if test="taskId != null and taskId != ''">
and rar.task_id = #{taskId}
</if>
<if test="maId != null and maId != ''">
and rar.ma_id = #{maId}
</if>
<if test="typeId != null and typeId != ''">
and rar.type_id = #{typeId}
</if>
</select>
</mapper>