art: 技术状态鉴定工单-流程问题修改

zhangherong

9 天以前 37c501ef03f84a36329bc7f95ab175273c185497

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java

@@ -343,7 +343,10 @@
                values.put("comment", "技术状态鉴定执行结束");
                request.setComment("技术状态鉴定执行结束");
                //设置entity
                if (parallelCompletion) {
                if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())
                        && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())
                        && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())
                        && parallelCompletion) {
                    //多个任务都已完成且维修室主任都已审批通过,会签完成，进行维修工签字
                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
                    userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
@@ -430,7 +433,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());