浏览代码

报修审核

guarantee-lsq 1 年之前
父节点
当前提交
34f1c69fb9

+ 5 - 0
platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -501,4 +501,9 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      */
      */
     private String verifyRepairRemark;
     private String verifyRepairRemark;
 
 
+    /**
+     * 报修审批人
+     */
+    private String verifyRepairUserId;
+
 }
 }

+ 5 - 0
platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -361,4 +361,9 @@ public class RepairApplicationForm implements Serializable {
      * 报修审核意见
      * 报修审核意见
      */
      */
     private String verifyRepairRemark;
     private String verifyRepairRemark;
+
+    /**
+     * 报修审批人
+     */
+    private String verifyRepairUserId;
 }
 }

+ 5 - 0
platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -487,4 +487,9 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      */
      */
     private String verifyRepairRemark;
     private String verifyRepairRemark;
 
 
+    /**
+     * 报修审批人
+     */
+    private String verifyRepairUserId;
+
 }
 }

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

@@ -86,7 +86,6 @@ public class SysUserController {
      * @return 用户信息
      * @return 用户信息
      */
      */
     @GetMapping(value = {"/info"})
     @GetMapping(value = {"/info"})
-//    @PreAuthorize("@pms.hasPermission('upms-users-info')")
     @SysLog("获取当前用户全部信息")
     @SysLog("获取当前用户全部信息")
     public R userInfo(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) {
     public R userInfo(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) {
         OauthUser user = SecurityUtils.getUser();
         OauthUser user = SecurityUtils.getUser();
@@ -590,6 +589,8 @@ public class SysUserController {
             dto.setRoleCode(SysRoleCodeEnum.FILL_CHECKER.name());
             dto.setRoleCode(SysRoleCodeEnum.FILL_CHECKER.name());
         }else if(roleType == 2){
         }else if(roleType == 2){
             dto.setRoleCode(SysRoleCodeEnum.FILL_CHECKER_LEADER.name());
             dto.setRoleCode(SysRoleCodeEnum.FILL_CHECKER_LEADER.name());
+        }else if(roleType == 3){
+            dto.setRoleCode(SysRoleCodeEnum.REPAIR_VERIFY_USER.name());
         }
         }
         return R.success(sysUserService.selectDeptRoleUser(dto));
         return R.success(sysUserService.selectDeptRoleUser(dto));
     }
     }