Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into dev_ch_master

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

@@ -63,7 +63,7 @@ public class TaskController {
      * @param isReturn      是否退回
      * @param pageNum       当前页
      * @param pageSize      每页几条数据
-     * @param type          1评定报告录入查询失能人员
+     * @param type         0-评定任务分配检索 1-评定报告录入查询失能人员  2-评定任务查询检索
      */
 
     @RequestMapping("/taskDistributionList")
@@ -284,8 +284,8 @@ public class TaskController {
      * 分配历史信息列表
      */
     @RequestMapping("/allotTaskHisList")
-    public Result<List<AllotTaskHisVO>> allotTaskHisList(Integer taskId) {
-        List<AllotTaskHisVO> list = taskService.allotTaskHisList(taskId);
+    public Result<List<AllotTaskHisVO>> allotTaskHisList(Integer disabId) {
+        List<AllotTaskHisVO> list = taskService.allotTaskHisList(disabId);
         return Result.success(list);
     }
 

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

@@ -69,7 +69,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
 
     TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
 
-    List<AllotTaskHisVO> allotTaskHisList(@Param("taskId") Integer taskId);
+    List<AllotTaskHisVO> allotTaskHisList(@Param("disabId") Integer disabId);
 
     Page<ReTaskDistributionVO> reTaskDistributionList(Page<ReTaskDistributionVO> page, @Param("organIds") List<Long> organIds, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode);
 

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

@@ -54,7 +54,7 @@ public interface TaskService {
 
     TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
 
-    List<AllotTaskHisVO> allotTaskHisList(Integer taskId);
+    List<AllotTaskHisVO> allotTaskHisList(Integer disabId);
 
     Result<Object> updatePushTimeAndRemark(String pushId, Date timeDate, String remark);
 

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

@@ -100,11 +100,12 @@ public class TaskServiceImpl implements TaskService {
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
-
         int aprType=0;
-        if (StrUtil.isNotBlank(realName)||StrUtil.isNotBlank(certiCode)) {
-            int count = taskMapper.queryApplyCount(realName,certiCode,2,2);
-            aprType=count>0?1:0;//count>0 复评已过，查询复评数据，反之查询初评数据。
+        if(type==1){
+            if (StrUtil.isNotBlank(realName)||StrUtil.isNotBlank(certiCode)) {
+                int count = taskMapper.queryApplyCount(realName,certiCode,2,2);
+                aprType=count>0?1:0;//count>0 复评已过，查询复评数据，反之查询初评数据。
+            }
         }
         return taskMapper.taskDistributionList(page, organIds, provincial, city,
                 street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area,type,aprType);
@@ -357,7 +358,7 @@ public class TaskServiceImpl implements TaskService {
         //附件上传
         this.updateAttachs(vo.getFileDataList(), chAprReport.getReportId().longValue());
         //修改鉴定报告人员(有就update,没有就insert)
-        List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", vo.getReportId()).orderByDesc("info_id"));
+        List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", vo.getReportId()).orderByAsc("info_id"));
         if (vo.getPerson1() != null) {
             if (personInfos.size() >= 1) {
                 ChAprPersonInfo personInfo = personInfos.get(0);
@@ -588,8 +589,8 @@ public class TaskServiceImpl implements TaskService {
      * 分配历史信息列表
      */
     @Override
-    public List<AllotTaskHisVO> allotTaskHisList(Integer taskId) {
-        return taskMapper.allotTaskHisList(taskId);
+    public List<AllotTaskHisVO> allotTaskHisList(Integer disabId) {
+        return taskMapper.allotTaskHisList(disabId);
     }
 
     /**

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

@@ -14,6 +14,7 @@
         task.apply_id applyId,
         fndOrgan.ORGAN_NAME organName,
         task.ORGAN_ID aprOrganId,
+        disable.disab_info_id disbleInfoId,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
@@ -66,7 +67,7 @@
         left join ch_refuse_reason reason on push.refuse_reason = reason.refuse_reason_id
         left join CH_FND_ORGAN fndOrgan on task.ORGAN_ID = fndOrgan.ORGAN_ID
         <where>
-            <if test="aprType != null ">
+            <if test="aprType != null  and  type == 1 ">
                 and task.APR_TYPE = #{aprType}
             </if>
             <if test="organIds != null">
@@ -402,9 +403,10 @@
                push.Refuse_remark    refuseRemark
         FROM ch_apr_task_push_his push
                  LEFT JOIN ch_apr_task task ON push.TASK_ID = task.TASK_ID
+                 left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
                  LEFT JOIN ch_apr_emp emp on push.emp_id = emp.emp_id
                  left join ch_apr_organ organ on emp.apr_organ_id = organ.apr_organ_id
-        WHERE push.TASK_ID = #{taskId}
+        WHERE disable.disab_info_id= #{disabId}
     </select>
 
     <select id="reTaskDistributionList" resultType="com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO">

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

@@ -99,6 +99,10 @@ public class TaskDistributionVO {
     //20230306业务类型 1-报告录入检索调用
     private int type;
 
+    //失能人员id
+    private Integer disbleInfoId;
+
+
 
 
 }