改造保养规范流程与升版导入代码

lyh

3 天以前 fd479eeb7dae6ec6b8b83d18e07aa163e8357eff

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

@@ -429,11 +429,11 @@
                }else{
                    userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                    values.put("dataId", entity.getId());
                    if (StrUtil.isEmpty(request.getManageUserResult())){
                        request.setManageUserResult("");
                    if (StrUtil.isEmpty(request.getDealDescription())){
                        request.setDealDescription("");
                    }
                    values.put("organization",request.getDealDescription());
                    values.put("comment", request.getManageUserResult());
                    values.put("comment", request.getDealDescription());
                    values.put("manageUserResult",request.getManageUserResult());
                    request.setComment(request.getDealDescription());
                    if (request.getManageUserResult().equals("2")){
@@ -463,7 +463,7 @@
                    entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_ADMIN_CONFIRM.name());
                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0004);
                    if (CollectionUtil.isEmpty(userSelectors)) {
                        throw new JeecgBootException("设备未存在管理员，无法进入下级审批！");
                        throw new JeecgBootException("设备未存在车间设备管理员，无法进入驳回审批！");
                    }else{
                        userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                        values.put("NextAssignee", userApprovalList);