guarantee-lsq 2 years ago
parent
commit
1735d66f7c

+ 5 - 0
platform-dao/src/main/java/com/platform/dao/dto/fill/FillGatherTaskDTO.java

@@ -143,4 +143,9 @@ public class FillGatherTaskDTO extends BaseDTO implements Serializable {
      */
     private List<FillGatherTaskDetailDTO> details;
 
+    /**
+     * 巡检任务周期频次 (天)
+     */
+    private Integer period;
+
 }

+ 5 - 0
platform-dao/src/main/java/com/platform/dao/entity/fill/FillGatherTask.java

@@ -104,6 +104,11 @@ public class FillGatherTask implements Serializable {
      */
     private Integer taskType;
 
+    /**
+     * 巡检任务周期频次 (天)
+     */
+    private Integer period;
+
     /**
      * 数据权限
      */

+ 9 - 0
platform-dao/src/main/java/com/platform/dao/enums/SysRoleCodeEnum.java

@@ -149,6 +149,15 @@ public enum SysRoleCodeEnum {
      * 维修主管--区域负责人
      */
     MM,
+
+    /**
+     * 巡检人
+     */
+    FILL_CHECKER,
+    /**
+     * 巡检主管
+     */
+    FILL_CHECKER_LEADER,
     ;
 
 }

+ 5 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/fill/FillGatherTaskVO.java

@@ -100,5 +100,10 @@ public class FillGatherTaskVO extends BaseVO implements Serializable {
 
     private List<FillGatherTaskDetailVO> details;
 
+    /**
+     * 巡检任务周期频次 (天)
+     */
+    private Integer period;
+
 
 }

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

@@ -23,6 +23,7 @@ import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.entity.firm.FirmProducer;
 import com.platform.dao.entity.upms.SysMenu;
 import com.platform.dao.entity.upms.SysUser;
+import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.util.TreeUtil;
 import com.platform.dao.vo.SysUserVO;
@@ -530,7 +531,7 @@ public class SysUserController {
     /**
      * 用户导出
      *
-     * @param firmProducerDTO 生产商DTO
+     * @param sysUserDTO 生产商DTO
      * @return R
      */
     @GetMapping("/exportUser")
@@ -550,4 +551,20 @@ public class SysUserController {
         }
         ExcelUtil.exportResponseDict(response, ExportSysUserVO.class, BeanConverterUtil.copyListProperties(voList, ExportSysUserVO.class), "用户数据");
     }
+
+    /**
+     * 指定部门的指定类型的负责人
+     * @param roleType :  1 巡检人 2 巡检主管
+     * @return :
+     */
+    @GetMapping("/query/user/{roleType}")
+    public R selectUsers(@PathVariable("roleType") Integer roleType) {
+        SysUserDTO dto = new SysUserDTO();
+        if(roleType == 1){
+            dto.setRoleCode(SysRoleCodeEnum.FILL_CHECKER.name());
+        }else if(roleType == 2){
+            dto.setRoleCode(SysRoleCodeEnum.FILL_CHECKER_LEADER.name());
+        }
+        return R.success(sysUserService.selectDeptRoleUser(dto));
+    }
 }