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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-06 11:47:55 +08:00
parent fa74b08c76 ba231b659c
commit 1655cdc492
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}, '%'))
</if>
GROUP BY tt.task_id
ORDER BY tt.update_time DESC
ORDER BY tt.task_status,tt.update_time DESC
</select>
<select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo">

40
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;
/**
* 查询新购验收编号管理
*
@ -77,19 +76,19 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
public List<PurchaseMacodeInfo> selectPurchaseMacodeInfoList(PurchaseMacodeInfo purchaseMacodeInfo) {
List<PurchaseMacodeInfo> purchaseMacodeInfoList = purchaseMacodeInfoMapper.selectPurchaseMacodeInfoList(purchaseMacodeInfo);
//判断有没有绑定固定资产
if (purchaseMacodeInfoList.size() > 0 && purchaseMacodeInfoList.get(0).getFixCode()!=null){
Map<Object,Long> groupCounts = purchaseMacodeInfoList.stream().map(PurchaseMacodeInfo::getFixCode).collect(Collectors.groupingBy(String::valueOf, Collectors.counting()));
//去重
purchaseMacodeInfoList = purchaseMacodeInfoList.stream().distinct().collect(Collectors.toList());
for (PurchaseMacodeInfo purchaseMacodeInfo1 : purchaseMacodeInfoList) {
groupCounts.forEach((fixCode, count) -> {
if (purchaseMacodeInfo1.getFixCode().equals(fixCode)) {
purchaseMacodeInfo1.setBindNum(count.intValue());
}
});
}
}
//判断有没有绑定固定资产
if (purchaseMacodeInfoList.size() > 0 && purchaseMacodeInfoList.get(0).getFixCode() != null) {
Map<Object, Long> groupCounts = purchaseMacodeInfoList.stream().map(PurchaseMacodeInfo::getFixCode).collect(Collectors.groupingBy(String::valueOf, Collectors.counting()));
//去重
purchaseMacodeInfoList = purchaseMacodeInfoList.stream().distinct().collect(Collectors.toList());
for (PurchaseMacodeInfo purchaseMacodeInfo1 : purchaseMacodeInfoList) {
groupCounts.forEach((fixCode, count) -> {
if (purchaseMacodeInfo1.getFixCode().equals(fixCode)) {
purchaseMacodeInfo1.setBindNum(count.intValue());
}
});
}
}
return purchaseMacodeInfoList;
}
@ -329,7 +328,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
//判断是否是成套机具，是的话配件库存也要增加
if ("2".equals(maType.getManageType())){
if ("2".equals(maType.getManageType())) {
PurchaseCheckInfo purchaseCheckInfo = new PurchaseCheckInfo();
purchaseCheckInfo.setPurchaseNum(maInputRecord.getInputNum().toString());
purchaseCheckInfo.setTypeId(maInputRecord.getTypeId());
@ -378,8 +377,8 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
}
}
//判断是否全部已操作（通过或不通过）
int count=purchaseMacodeInfoMapper.isOperateAll(taskId);
if (count<=0){
int count = purchaseMacodeInfoMapper.isOperateAll(taskId);
if (count <= 0) {
//全部审核任务状态改为已审核
TmTask task = new TmTask();
task.setTaskId(taskId);
@ -430,10 +429,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
public List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo) {
List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) {
List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue());
if (CollUtil.isNotEmpty(userIds)){
macodeInfo.setUserIds(userIds);
}
List<String> userIds = purchaseMacodeInfoMapper.selectKeepUser(macodeInfo.getTypeId().intValue());
userIds.add("1");
macodeInfo.setUserIds(userIds);
}
return purchaseMacodeInfos;
}

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

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