| | |
| | | userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList()); |
| | | values.put("NextAssignee", userApprovalList); |
| | | values.put("dataId", entity.getId()); |
| | | if (StrUtil.isEmpty(request.getDealDescription())){ |
| | | request.setDealDescription(""); |
| | | } |
| | | values.put("organization",request.getDealDescription()); |
| | | values.put("comment", request.getDealDescription()); |
| | | values.put("manageUserResult",request.getManageUserResult()); |
| | |
| | | entity.setDealDescription(request.getDealDescription()); |
| | | entity.setConfirmTime(new Date()); |
| | | request.setComment(request.getDealDescription()); |
| | | if (request.getManageUserResult().equals("2")){ |
| | | entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name()); |
| | | } |
| | | } |
| | | break; |
| | | case WAIT_INSPECTOR_CONFIRM: |
| | | //检查人确认 |
| | | if (StrUtil.isEmpty(request.getDealDescription())){ |
| | | request.setDealDescription(""); |
| | | } |
| | | values.put("dataId", entity.getId()); |
| | | values.put("organization",request.getInspectConfirmComment()); |
| | | values.put("comment", request.getInspectConfirmComment()); |
| | |
| | | entity.setInspectConfirmComment(request.getInspectConfirmComment()); |
| | | entity.setInspectConfirmTime(new Date()); |
| | | request.setComment(request.getDealDescription()); |
| | | if (request.getInspectorResult().equals("2")){ |
| | | entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name()); |
| | | } |
| | | break; |
| | | default: |
| | | throw new JeecgBootException("审批失败"); |