评定列表

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -26,10 +26,9 @@ public class TaskController {
     private TaskService taskService;
 
     /**
-     * 评定任务分配列表
+     * 评定任务分配、查询列表
      *
      * @param organId       适用机构代码
-     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param provincial    所在省
      * @param city          所在市
      * @param area          所在区域
@@ -45,11 +44,11 @@ public class TaskController {
      * @param pageSize      每页几条数据
      */
     @RequestMapping("/taskDistributionList")
-    public Result<List<TaskDistributionVO>> taskDistributionList(String organId, String isIncludeSubsidiaries, String provincial, String city,
+    public Result<List<TaskDistributionVO>> taskDistributionList(String organId, String provincial, String city,
                                                                  String street, String realName, String certiCode, String taskName, String taskTel,
                                                                  String daysRemaining, String status, String isReturn, String area,
                                                                  int pageNum, int pageSize) {
-        IPage<TaskDistributionVO> iPage = taskService.taskDistributionList(organId, isIncludeSubsidiaries, provincial, city,
+        IPage<TaskDistributionVO> iPage = taskService.taskDistributionList(organId, provincial, city,
                 street, realName, certiCode, taskName, taskTel, daysRemaining, status, isReturn, area,
                 pageNum, pageSize);
         return Result.success(iPage.getRecords());

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -23,7 +23,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
      * 评定任务分配列表
      *
      * @param organIds              适用机构代码
-     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param provincial            所在省
      * @param city                  所在市
      * @param area                  所在区域
@@ -36,7 +35,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
      * @param status                任务状态
      * @param isReturn              是否退回
      */
-    Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, List<String> organIds, String isIncludeSubsidiaries, String provincial, String city,
+    Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, List<String> organIds, String provincial, String city,
                                                   String street, String realName, String certiCode, String taskName, String taskTel,
                                                   String daysRemaining, String status, String isReturn, String area);
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -19,7 +19,6 @@ public interface TaskService {
      * 评定任务分配列表
      *
      * @param organId               适用机构代码
-     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param provincial            所在省
      * @param city                  所在市
      * @param area                  所在区域
@@ -34,7 +33,7 @@ public interface TaskService {
      * @param pageNum               当前页
      * @param pageSize              每页几条数据
      */
-    IPage<TaskDistributionVO> taskDistributionList(String organId, String isIncludeSubsidiaries, String provincial, String city,
+    IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
                                                    String street, String realName, String certiCode, String taskName, String taskTel,
                                                    String daysRemaining, String status, String isReturn, String area,
                                                    int pageNum, int pageSize);

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -20,7 +20,7 @@ public class TaskServiceImpl implements TaskService {
     private TaskMapper taskMapper;
 
     @Override
-    public IPage<TaskDistributionVO> taskDistributionList(String organId, String isIncludeSubsidiaries, String provincial, String city,
+    public IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
                                                           String street, String realName, String certiCode, String taskName, String taskTel,
                                                           String daysRemaining, String status, String isReturn, String area,
                                                           int pageNum, int pageSize) {
@@ -28,7 +28,7 @@ public class TaskServiceImpl implements TaskService {
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
-        return taskMapper.taskDistributionList(new Page<>(pageNum, pageSize), organIds, isIncludeSubsidiaries, provincial, city,
+        return taskMapper.taskDistributionList(new Page<>(pageNum, pageSize), organIds, provincial, city,
                 street, realName, certiCode, taskName, taskTel, daysRemaining, status, isReturn, area);
     }