优化

platform-dao/src/main/java/com/platform/dao/dto/preparation/PreparationDTO.java

@@ -230,4 +230,8 @@ public class PreparationDTO extends BaseDTO implements Serializable {
      */
     private String verifyRemark;
 
+    private String feeContent; // 费用描述
+
+    private Integer nodeNum; // 审核节点
+
 }

platform-dao/src/main/java/com/platform/dao/entity/preparation/Preparation.java

@@ -166,5 +166,9 @@ public class Preparation implements Serializable{
      */
     private String receiveVerifyLeader;
 
+    private String feeContent; // 费用描述
+
+    private Integer nodeNum; // 审核节点
+
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationVO.java

@@ -194,4 +194,8 @@ public class PreparationVO extends BaseVO implements Serializable {
     private BigDecimal backNum; // 回退工单
     private BigDecimal workingNum; // 执行工单
 
+    private String feeContent; // 费用描述
+
+    private Integer nodeNum; // 审核节点
+
 }

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -635,7 +635,7 @@ public class SysUserController {
     public R selectRoleDeptNameUsers(@PathVariable("roleName") String roleName,@PathVariable("deptId") String deptId) {
         SysUserDTO dto = new SysUserDTO();
         dto.setRoleCode(roleName);
-        //dto.setDeptId(deptId);
+        dto.setDeptId(deptId);
         return R.success(sysUserService.selectDeptRoleUser(dto));
     }
 

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -512,6 +512,8 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 if (!currentUserId.equals(preparation.getUserId())) {
                     throw new DeniedException("不具备审核权限");
                 }
+                updPre.setFee(model.getFee());
+                //model.setVerifyRemark(model.getVerifyRemark() + "【费用"+preparation.getFee() + "->"+model.getFee() + "】");
                 if (model.getVerifyStatus() == 1) { // 通过
                     updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING.getValue());
                 } else if (model.getVerifyStatus() == 3) { // 回退
@@ -573,6 +575,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         updPre.setReceiveDept(model.getReceiveDept());
         updPre.setApplyReason(model.getApplyReason());
         updPre.setContent(model.getContent());
+        updPre.setFee(model.getFee());
         SysUserDTO queryUserDTO = new SysUserDTO();
         List<SysUserVO> userVOS = null;
         // 查询发送消息用户
@@ -686,6 +689,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         updPre.setId(model.getId());
         updPre.setStatus(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
         updPre.setFee(model.getFee());
+        updPre.setFeeContent(model.getFeeContent());
         // 保存文件图片
         sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_IMGS.getValue(), model.getImageList());
         sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_FILES.getValue(), model.getFileList());