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

试运行问题修改

This commit is contained in:
csyue 2024-06-05 17:48:30 +08:00
parent 2a0556f200
commit 8c3665d599
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -584,7 +584,7 @@
AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%')) AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%'))
</if> </if>
GROUP BY tt.task_id GROUP BY tt.task_id
ORDER BY tt.update_time DESC ORDER BY tt.task_status,tt.update_time DESC
</select> </select>
<select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo"> <select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo">

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
View File

@ -55,7 +55,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
private PurchaseCheckDetailsMapper checkDetailsMapper; private PurchaseCheckDetailsMapper checkDetailsMapper;
/** /**
* 查询新购验收编号管理 * 查询新购验收编号管理
* *
@ -431,10 +430,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo); List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) { for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) {
List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue()); List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue());
if (CollUtil.isNotEmpty(userIds)){ userIds.add("1");
macodeInfo.setUserIds(userIds); macodeInfo.setUserIds(userIds);
} }
}
return purchaseMacodeInfos; return purchaseMacodeInfos;
} }

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
View File

@ -58,10 +58,9 @@ public class RepairTestInputServiceImpl implements RepairTestInputService {
List<RepairTestInputDetailVo> repairedDetailList = mapper.getRepairedDetailList(dto); List<RepairTestInputDetailVo> repairedDetailList = mapper.getRepairedDetailList(dto);
for (RepairTestInputDetailVo repairTestInputDetailVo : repairedDetailList) { for (RepairTestInputDetailVo repairTestInputDetailVo : repairedDetailList) {
List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(repairTestInputDetailVo.getTypeId()); List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(repairTestInputDetailVo.getTypeId());
if (CollUtil.isNotEmpty(userIds)) { userIds.add("1");
repairTestInputDetailVo.setUserIds(userIds); repairTestInputDetailVo.setUserIds(userIds);
} }
}
return repairedDetailList; return repairedDetailList;
} }