From 42c6702c415ad4e2d6bbd07545820bf98292111e Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 15 七月 2025 20:33:18 +0800 Subject: [PATCH] art: 技术状态鉴定工单-流程问题修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java index cf2a3ab..1aa49f8 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java @@ -331,6 +331,9 @@ List<UserSelector> userSelectors; switch (status) { case UNDER_EVALUATION: + if(CollectionUtil.isEmpty(request.getTableDetailList())) { + throw new JeecgBootException("妫�鏌ユ槑缁嗕俊鎭负绌猴紒"); + } boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId()); //鎵ц瀹屾垚 userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008); @@ -433,7 +436,7 @@ entity.setOtherCheckCompleted(CommonConstant.STATUS_1); } else if ("other_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())) { values.put("otherCheckFlag", request.getOtherCheckConfirmResult()); - entity.setOtherCheckResult(request.getOtherCheckConfirmResult()); + entity.setOtherCheckConfirmResult(request.getOtherCheckConfirmResult()); entity.setOtherCheckConfirm(user.getUsername()); entity.setOtherCheckConfirmTime(new Date()); entity.setOtherCheckConfirmComment(request.getOtherCheckConfirmComment()); @@ -482,6 +485,7 @@ entity.setRepairManagerSignature(user.getUsername()); entity.setRepairManagerSignatureTime(new Date()); entity.setRepairManagerComment(request.getRepairManagerComment()); + entity.setRepairManagerSignatureResult(request.getRepairManagerSignatureResult()); //璁剧疆entity if (BusinessCodeConst.APPROVED.equals(request.getRepairManagerSignatureResult())) { values.put("NextAssignee", userApprovalList); @@ -528,6 +532,7 @@ entity.setDepartTechnicalLeaderSignature(user.getUsername()); entity.setDepartTechnicalLeaderSignatureTime(new Date()); entity.setDepartTechnicalLeaderComment(request.getDepartTechnicalLeaderComment()); + entity.setDepartTechnicalLeaderSignatureResult(request.getDepartTechnicalLeaderSignatureResult()); //璁剧疆entity if (BusinessCodeConst.APPROVED.equals(request.getDepartTechnicalLeaderSignatureResult())) { values.put("NextAssignee", userApprovalList); -- Gitblit v1.9.3