评定报告录入分页+只录入已分配失能人员

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

@@ -59,7 +59,7 @@ public class TaskController {
      * @param taskName      评定人员姓名
      * @param taskTel       评定人员手机号码
      * @param daysRemaining 评定剩余天数
-     * @param status        任务状态
+     * @param taskStatus        任务状态
      * @param isReturn      是否退回
      * @param pageNum       当前页
      * @param pageSize      每页几条数据
@@ -68,9 +68,9 @@ public class TaskController {
     public Result<Page<TaskDistributionVO>> taskDistributionList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
                                                                  String organId, String provincial, String city,
                                                                  String street, String realName, String certiCode, String taskName, String taskTel,
-                                                                 String daysRemaining, String taskStatus, String isReturn, String area) {
+                                                                 String daysRemaining, String taskStatus, String isReturn, String area,int type) {
         Page<TaskDistributionVO> page = new Page<>(pageNum, pageSize);
-        page = taskService.taskDistributionList(page, organId, provincial, city, street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area);
+        page = taskService.taskDistributionList(page, organId, provincial, city, street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area,type);
         return Result.success(page);
     }
 
@@ -82,9 +82,10 @@ public class TaskController {
      * @param tel       失能人员手机号码
      */
     @RequestMapping("/taskReportList")
-    public Result<List<TaskReportVO>> taskReportList(String name, String certiCode, String tel) {
-        List<TaskReportVO> taskReportList = taskService.taskReportList(name, certiCode, tel);
-        return Result.success(taskReportList);
+    public Result<Page<TaskReportVO>> taskReportList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,String name, String certiCode, String tel) {
+        Page<TaskReportVO> page = new Page<>(pageNum, pageSize);
+        page = taskService.taskReportList(page,name, certiCode, tel);
+        return Result.success(page);
     }
 
     /**
@@ -213,16 +214,6 @@ public class TaskController {
     /**
      * 评定报告修改
      *
-     * @param reportId       评定报告id
-     * @param person1        鉴定人员1id
-     * @param person2        鉴定人员2id
-     * @param person3        鉴定人员3id
-     * @param evaluateTime   评估时间 格式:2020-11-12
-     * @param disableLevelId 失能等级id
-     * @param polNo          保单号
-     * @param remark         备注
-     * @param remark         备注
-     * @param fileDataList   附件
      */
     @RequestMapping("/updateReport")
     public Result updateReport(ReportUpdateVO vo) {
@@ -242,7 +233,6 @@ public class TaskController {
 
     /**
      * 添加评估公示信息
-     * @param taskId
      * @return
      */
     @RequestMapping("/updateReportPublicityInfo")

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

@@ -32,17 +32,17 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
      * @param taskName      评定人员姓名
      * @param taskTel       评定人员手机号码
      * @param daysRemaining 评定剩余天数
-     * @param status        任务状态
+     * @param taskStatus        任务状态
      * @param isReturn      是否退回
      */
     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 taskStatus, String isReturn, String area);
+                                                  String daysRemaining, String taskStatus, String isReturn, String area,int type);
 
     /**
      * 评定报告录入列表
      */
-    List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
+    Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
 
     TaskReportVO getReportById(String reportId);
 

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

@@ -26,9 +26,9 @@ public interface TaskService {
 
     Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, String organId, String provincial, String city,
                                                   String street, String realName, String certiCode, String taskName, String taskTel,
-                                                  String daysRemaining, String taskStatus, String isReturn, String area);
+                                                  String daysRemaining, String taskStatus, String isReturn, String area,int type);
 
-    List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
+    Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
 
     List<AprEmpVO> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);
 

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

@@ -85,19 +85,19 @@ public class TaskServiceImpl implements TaskService {
      * @param taskName      评定人员姓名
      * @param taskTel       评定人员手机号码
      * @param daysRemaining 评定剩余天数
-     * @param status        任务状态
+     * @param taskStatus        任务状态
      * @param isReturn      是否退回
      */
     @Override
     public Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, String organId, String provincial, String city,
                                                          String street, String realName, String certiCode, String taskName, String taskTel,
-                                                         String daysRemaining, String taskStatus, String isReturn, String area) {
+                                                         String daysRemaining, String taskStatus, String isReturn, String area,int type) {
         List<String> organIds = null;
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
         return taskMapper.taskDistributionList(page, organIds, provincial, city,
-                street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area);
+                street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area,type);
     }
 
     /**
@@ -108,8 +108,8 @@ public class TaskServiceImpl implements TaskService {
      * @param tel       失能人员手机号码
      */
     @Override
-    public List<TaskReportVO> taskReportList(String name, String certiCode, String tel) {
-        return taskMapper.taskReportList(name, certiCode, tel);
+    public Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel) {
+        return taskMapper.taskReportList(page,name, certiCode, tel);
     }
 
     /**

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -61,6 +61,7 @@
         left join CH_FND_ORGAN fndOrgan on task.ORGAN_ID = fndOrgan.ORGAN_ID
         <where>
             and task.APR_TYPE = 0
+
             <if test="organIds != null">
                 and task.ORGAN_ID in
                 <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -103,6 +104,9 @@
             <if test="isReturn != null  and isReturn !='' and isReturn == 1">
                 and cate.is_valid = 0 or cate.is_valid is null
             </if>
+            <if test ="type == 1">
+                and disable.LAST_TASK_ID is not null
+            </if>
         </where>
     </select>
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskDistributionVO.java

@@ -95,4 +95,8 @@ public class TaskDistributionVO {
     private String diseaseDesc;
     //现住地址详细地址
     private String operAddress;
+
+    //20230306业务类型 1-报告录入检索调用
+    private int type;
+
 }