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

维修拆分

This commit is contained in:
mashuai 2025-03-11 09:31:57 +08:00
parent 13cddfef9a
commit 8b50866190
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -249,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.nick_name createBy, su.nick_name createBy,
tk.create_time createTime, tk.create_time createTime,
tk.remark, tk.remark,
tk.CODE repairNum a.code repairNum
FROM FROM
tm_task tk tm_task tk
LEFT JOIN tm_task_agreement tta ON tk.task_id = tta.task_id LEFT JOIN tm_task_agreement tta ON tk.task_id = tta.task_id
@ -269,6 +269,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON rad.type_id = mt.type_id LEFT JOIN ma_type mt ON rad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN sys_user su ON su.user_id = tk.create_by LEFT JOIN sys_user su ON su.user_id = tk.create_by
LEFT JOIN (SELECT rad1.id as id, tt.code as code from repair_apply_details rad1
LEFT JOIN tm_task tt on rad1.task_id = tt.task_id) a ON a.id = rad.repair_id
WHERE WHERE
tk.task_type = 45 tk.task_type = 45
<if test="keyword != null and keyword != ''"> <if test="keyword != null and keyword != ''">