From e5a85d904ce028a35229ab6245ab894afbca6531 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 17:07:30 +0800
Subject: [PATCH] 维修工单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 854da31..96338b7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -347,6 +347,16 @@
variables.put("organization", "淇濆吇瑙勮寖鍚姩娴佺▼");
variables.put("comment", "淇濆吇瑙勮寖鍚姩娴佺▼");
variables.put("proofreading", true);
+ EamEquipment eamEquipment = eamEquipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<UserSelector> userSelectorList = sysUserService.selectOperatorList(eamEquipment.getEquipmentCode(), eamEquipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
+ if (!CollectionUtils.isEmpty(userSelectorList)) {
+ List<String> usernameList = userSelectorList.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(usernameList)) {
+ variables.put("NextAssignee", usernameList);
+ }else {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇涓讳换锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ }
Result result = flowDefinitionService.startProcessInstanceByKey("eam_maintenance_standard", variables);
if (!result.isSuccess()) {
super.removeById(maintenanceStandard.getId());
@@ -362,14 +372,6 @@
);
if (businessList.isEmpty()) {
return Result.error("娴佺▼璁板綍涓嶅瓨鍦�");
- }
- FlowMyBusiness flowMyBusiness = businessList.get(0);
- EamEquipment eamEquipment = eamEquipmentService.getById(maintenanceStandard.getEquipmentId());
- List<UserSelector> userSelectorList = sysUserService.selectOperatorList(eamEquipment.getEquipmentCode(), eamEquipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
- if (!CollectionUtils.isEmpty(userSelectorList)) {
- List<String> usernameList = userSelectorList.stream().map(UserSelector::getUsername).collect(Collectors.toList());
- flowMyBusiness.setTodoUsers(JSON.toJSONString(usernameList));
- flowMyBusinessService.updateById(flowMyBusiness);
}
}
return result;
@@ -441,22 +443,7 @@
eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.REJECTED.name());
}
if (eamMaintenanceStandardVo.getRepairManagerApproveResult().equals("1")) {
- List<FlowMyBusiness> newbusinessList = flowMyBusinessService.list(
- new QueryWrapper<FlowMyBusiness>()
- .eq("process_instance_id", eamMaintenanceStandardVo.getInstanceId()));
- FlowMyBusiness newflowMyBusiness = newbusinessList.get(0);
eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_TECHNICAL_DIRECTOR.name());
- //鑾峰彇flow鐨勬祦绋嬪疄渚媔d,璁剧疆涓嬩竴姝ョ殑澶勭悊浜哄憳
- EamMaintenanceStandard maintenanceStandard = this.getById(eamMaintenanceStandardVo.getDataId());
- EamEquipment eamEquipment = eamEquipmentService.getById(maintenanceStandard.getEquipmentId());
- List<UserSelector> userSelectorList = sysUserService.selectOperatorList(eamEquipment.getEquipmentCode(), eamEquipment.getFactoryOrgCode(), BusinessCodeConst.PCR0009);
- if (!CollectionUtils.isEmpty(userSelectorList)) {
- List<String> usernameList = userSelectorList.stream().map(UserSelector::getUsername).collect(Collectors.toList());
- newflowMyBusiness.setTodoUsers(JSON.toJSONString(usernameList));
- flowMyBusinessService.updateById(newflowMyBusiness);
- }else {
- throw new JeecgBootException("璁惧鏈瓨鍦ㄧ鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
- }
} else {
eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
}
@@ -517,6 +504,16 @@
values.put("organization", eamMaintenanceStandardVo.getTechnicalManagerApproveComment());
values.put("comment", eamMaintenanceStandardVo.getTechnicalManagerApproveComment());
}
+ List<UserSelector> userSelectorList=new ArrayList<>();
+ if (eamMaintenanceStandardVo.getRepairManagerApproveResult() != null) {
+ //鑾峰彇flow鐨勬祦绋嬪疄渚媔d,璁剧疆涓嬩竴姝ョ殑澶勭悊浜哄憳
+ EamMaintenanceStandard maintenanceStandard = this.getById(eamMaintenanceStandardVo.getDataId());
+ EamEquipment eamEquipment = eamEquipmentService.getById(maintenanceStandard.getEquipmentId());
+ userSelectorList = sysUserService.selectOperatorList(eamEquipment.getEquipmentCode(), eamEquipment.getFactoryOrgCode(), BusinessCodeConst.PCR0009);
+ if (CollectionUtils.isEmpty(userSelectorList)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄧ鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ }
return values;
}
@@ -540,8 +537,9 @@
@Override
public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
- //涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
- return null;
+ //鑾峰彇涓嬩竴姝ュ鐞嗕汉
+ Object object = values.get("NextAssignee");
+ return (List<String>) object;
}
/*娴佺▼涓氬姟浠ｇ爜--------------------------缁撴潫*/
--
Gitblit v1.9.3