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

维修问题修复

This commit is contained in:
hongchao 2025-11-19 16:35:54 +08:00
parent 6b7f8d2545
commit fdbeb27506
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -166,14 +166,14 @@ public class RepairServiceImpl implements RepairService {
} }
if (!CollectionUtils.isEmpty(repairMaTypeList)) { // if (!CollectionUtils.isEmpty(repairMaTypeList)) {
for (RepairTaskDetails repairTaskDetails : repairMaTypeList) { // for (RepairTaskDetails repairTaskDetails : repairMaTypeList) {
// 根据合格数量和报废数量，对数据状态status重新定值完成状态,考虑维修查看页面的展示 // // 根据合格数量和报废数量，对数据状态status重新定值完成状态,考虑维修查看页面的展示
if (repairTaskDetails.getRepairedNum() == 0 && repairTaskDetails.getScrapNum() == 0) { // if (repairTaskDetails.getRepairedNum() == 0 && repairTaskDetails.getScrapNum() == 0) {
repairTaskDetails.setStatus("0"); // repairTaskDetails.setStatus("0");
} // }
} // }
} // }
return repairMaTypeList; return repairMaTypeList;
} }

7
sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -487,7 +487,10 @@
rad.repaired_num as repairedNum, rad.repaired_num as repairedNum,
rad.repair_remark as repairRemark, rad.repair_remark as repairRemark,
rad.scrap_num as scrapNum, rad.scrap_num as scrapNum,
rad.status as status, case
when rad.repaired_num = 0 and rad.scrap_num = 0 then '0'
else rad.status
end as status,
rad.update_time as updateTime, rad.update_time as updateTime,
rad.type_id as typeId, rad.type_id as typeId,
rad.repairer as repairer, rad.repairer as repairer,
@ -515,7 +518,7 @@
</if> </if>
</where> </where>
order by order by
sub.createTime desc sub.maId desc
</select> </select>
<select id="getRepairPartListNew" resultType="com.bonus.sgzb.base.domain.RepairPartDetails"> <select id="getRepairPartListNew" resultType="com.bonus.sgzb.base.domain.RepairPartDetails">