From 8dc8985eb32198788bef7ad21cf3f1726d840b6f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 19:33:23 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index 64c293b..ac7265f 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -668,9 +668,9 @@
order.setQrcodeId(barcodeParamExtService.getByType(user.getCompany().getId(),mp.getDepartId(),Constants.BARCODEPARAM_TYPE.workorder));
order.setProUserList(param.getProUserList());
order.setProGroupId(param.getProGroupId());
- //鏌ヨ鐢熶骇鐝粍鍜屼汉鍛樻槸鍚﹀悎娉�
- checkUserAndGroup(order,mp,user);
workorderExtMapper.insert(order);
+ //鏌ヨ鐢熶骇鐝粍鍜屼汉鍛樻槸鍚﹀悎娉�
+ checkUserAndGroupNew(order,mp,user);
//宸ュ崟鍘嗗彶鏁版嵁
whList.add(WorkorderExtServiceImpl.initHistoryByModel(order,user.getId(),Constants.WORKORDER_HISTORY_STATUS.create));
workorderHistoryExtMapper.insertBatch(whList);
@@ -681,6 +681,34 @@
workorderUserExtMapper.insert(wu);
}
return order;
+ }
+
+
+ private void checkUserAndGroupNew(Workorder param, PlansExtListVO model,LoginUserInfo user) throws BusinessException{
+ QueryDeviceExtDTO ud = new QueryDeviceExtDTO();
+ ud.setDeleted(Constants.ZERO);
+ ud.setId(param.getProGroupId());
+ ud.setRootDepartId(user.getRootDepartment().getId());
+ //鏌ヨ鐢ㄦ埛璁惧鍏宠仈鍏崇郴
+ DeviceExtListVO d = deviceExtMapper.selectByModel( ud );
+ if(d == null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鐢熶骇璁惧淇℃伅涓嶆纭紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
+ }
+
+ List<WorkorderUser> userList = new ArrayList<>();
+ for(Integer userId : param.getProUserList()){
+ WorkorderUser u = new WorkorderUser();
+ u.setProUserId(userId);
+ u.setPlanId(model.getId());
+ u.setCreateUser(user.getId());
+ u.setDeleted(Constants.ZERO);
+ u.setCreateTime(DateUtil.getCurrentDate());
+ u.setRootDepartId(model.getRootDepartId());
+ u.setDepartId(model.getDepartId());
+ userList.add(u);
+ }
+ param.setWorkorderUserList(userList);
+
}
private void checkUserAndGroup(Workorder param, PlansExtListVO model,LoginUserInfo user) throws BusinessException{
@@ -1638,7 +1666,7 @@
}
//宸ュ崟浜у嚭璁板綍
autoWorkReportDTO.getCreateWorkorderRecordDTO().setWorkorderId(workorder.getId());
- WorkorderRecord workorderRecord = workorderRecordStandardService.createWorkorderRecord(autoWorkReportDTO.getCreateWorkorderRecordDTO(),user);
+ WorkorderRecord workorderRecord = workorderRecordStandardService.createWorkorderRecord(autoWorkReportDTO.getCreateWorkorderRecordDTO(),user,autoWorkReportDTO.getProUserList().get(Constants.ZERO));
//宸ュ崟鎶ュ伐
workorderRecordStandardService.comfirmDone(workorder,false);
//鏇存柊宸ュ崟鐘舵��
--
Gitblit v1.9.3