历史评定信息接口优化联调

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChDisableInfoChangeMapper.java

@@ -3,9 +3,11 @@ package com.hungraim.ltc.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfoChange;
 import com.hungraim.ltc.pojo.vo.disable.DisableInfoChangeVo;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
+@Mapper
 public interface ChDisableInfoChangeMapper extends BaseMapper<ChDisableInfoChange> {
     /**
      * 失能人员信息变更-审核列表

apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableInfoHisMapper.java

@@ -2,6 +2,8 @@ package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.assessment.ChDisableInfoHis;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface DisableInfoHisMapper extends BaseMapper<ChDisableInfoHis> {
 }

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

@@ -7,6 +7,7 @@ import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
 import com.hungraim.ltc.service.ReTaskService;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,15 +32,15 @@ public class ReTaskController {
     /**
      * 可以进行复评申请的列表
      *
-     * @param organId        适用机构id
-     * @param isChildGroup     是否包含下级机构,值为true，则包含organId的下层机构
+     * @param organId            适用机构id
+     * @param isChildGroup       是否包含下级机构,值为true，则包含organId的下层机构
      * @param districtProvincial 所在省
      * @param districtCity       所在市
      * @param districtArea       所在区域
-     * @param realName       失能人员姓名
-     * @param certiCode      失能人员身份证号码
-     * @param pageNum        当前页
-     * @param pageSize       每页几条数据
+     * @param realName           失能人员姓名
+     * @param certiCode          失能人员身份证号码
+     * @param pageNum            当前页
+     * @param pageSize           每页几条数据
      */
     @RequestMapping("/reTaskDistributionList")
     public Result<Page<ReTaskDistributionVO>> reTaskDistributionList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
@@ -49,30 +50,39 @@ public class ReTaskController {
         page = reTaskService.reTaskDistributionList(page, organId, isChildGroup, districtProvincial, districtCity, districtArea, realName, certiCode);
         return Result.success(page);
     }
+
     /**
-     * 复评申请详情
+     * 复评申请详情(作废)
      */
     @GetMapping("/reassmentDetail")
-    public Result reassmentDetailById(String applyId){
+    public Result reassmentDetailById(String applyId) {
         ChDisableApplyVo chDisableApplyVo = reTaskService.reassmentDetailById(applyId);
-        if (chDisableApplyVo!=null){
+        if (chDisableApplyVo != null) {
             return Result.success(chDisableApplyVo);
         }
         return Result.failed("没有查到该复评申请数据");
     }
+
     /**
      * 复评申请-历史评定信息
      */
     @GetMapping("/hisinfo-list")
-    public Result<List<ChAprTaskVo>> getRetaskHisList(String disableInfoId){
-         List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList(disableInfoId);
-         return Result.success(chAprTaskVos);
+    public Result<List<ChAprTaskVo>> getRetaskHisList(String disableInfoId) {
+        if (StringUtils.isBlank(disableInfoId)) {
+            return Result.failed("查询参数错误");
+        }
+        List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList(disableInfoId);
+        return Result.success(chAprTaskVos);
     }
+
     /**
      * 复评审核
      */
     @RequestMapping("/disableExamine")
     public Result disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
+        if (StringUtils.isBlank(applyId) || StringUtils.isBlank(checkName) || StringUtils.isBlank(checkRemark) || null == applyStatus) {
+            return Result.failed("查询参数错误");
+        }
         reTaskService.disableExamine(applyId, checkName, applyStatus, checkRemark);
         return Result.success();
     }

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

@@ -71,8 +71,7 @@ public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implem
     @Override
     public List<ChAprTaskVo> geReTaskHisInfoList(String disableInfoId) {
         // 历史评定信息列表
-        List<ChAprTaskVo> reTaskHisInfoList = reTaskMapper.getReTaskHisInfoList(disableInfoId);
-        return reTaskHisInfoList;
+        return reTaskMapper.getReTaskHisInfoList(disableInfoId);
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -337,6 +337,7 @@
 
     <select id="reTaskDistributionList" resultType="com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO">
         select
+        info.DISAB_INFO_ID disableInfoId,
         task.task_id taskId,
         task.apply_id applyId,
         fndOrgan.ORGAN_NAME organName,

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

@@ -4,7 +4,8 @@
 
     <select id="getReTaskHisInfoList" resultType="com.hungraim.ltc.pojo.vo.assessment.ChAprTaskVo">
         select
-            (select ORGAN_NAME from CH_FND_ORGAN organ where task.ORGAN_ID=organ.ORGAN_ID )organName,
+            task.TASK_ID taskId,
+            organ.ORGAN_NAME organName,
             task.ORGAN_ID organId,
             task.DISTRICT_PROVINCIAL districtProvincial,
             task.DISTRICT_CITY districtCity,
@@ -12,24 +13,25 @@
             disinfo.REAL_NAME realName,
             apply.EFF_TIME effTime,
             disinfo.CERTI_CODE certiCode,
-            disinfo.BIRTHDAY birthDay,
-            (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disinfo.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
+            disinfo.BIRTHDAY birthday,
+            disinfo.DISE_TYPE_S diseTypeS,
             disinfo.TEL tel,
             disinfo.ACPT_PROVINCIAL acptProvincial,
             disinfo.ACPT_CITY acptCity,
             disinfo.ACPT_AREA acptArea,
             disinfo.ACPT_STREET acptStreet,
             disinfo.ACPT_ADDRESS acptAddress,
-            (select REAL_NAME from CH_APR_EMP aprEmp where taskEmp.EMP_ID=aprEmp.EMP_ID)EmprealName,
-            (select TEL from CH_APR_EMP aprEmp where taskEmp.EMP_ID=aprEmp.EMP_ID)EmpTel,
+            aprEmp.REAL_NAME empRealName,
+            aprEmp.TEL empTel,
             task.ASSIGN_TIME assignTime,
             task.ACCEPT_TIME acceptTime,
             task.FINISH_TIME finishTime,
             task.TASK_STATUS taskStatus
         from CH_APR_TASK task
                  left join CH_DISABLE_INFO disinfo on task.DISABLE_INFO_ID=disinfo.DISAB_INFO_ID
+                 left join CH_FND_ORGAN organ on disinfo.ORGAN_ID=organ.ORGAN_ID
                  left join CH_DISABLE_APPLY apply on task.APPLY_ID=apply.APPLY_ID
-                 left join CH_APR_TASK_EMP taskEmp on task.TASK_ID=taskEmp.TASK_ID
+                 left join CH_APR_EMP aprEmp on task.APR_EMP_ID=aprEmp.EMP_ID
         where disinfo.DISAB_INFO_ID = #{disableInfoId}
     </select>
 

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

 package com.hungraim.ltc.pojo.vo.assessment;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -9,6 +10,12 @@ import java.util.Date;
  */
 @Data
 public class ChAprTaskVo {
+
+    /**
+     * 评定任务id
+     */
+    private Long taskId;
+
     /**
      * 失能人员id
      */
@@ -34,6 +41,7 @@ public class ChAprTaskVo {
     /**
      * 申请日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date effTime;
     /**
      * 省份证号码
@@ -42,11 +50,12 @@ public class ChAprTaskVo {
     /**
      * 出生日期
      */
-    private Date birthDay;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
     /**
      * 诊断疾病
      */
-    private String disease;
+    private String diseTypeS;
     /**
      * 联系电话
      */
@@ -62,22 +71,25 @@ public class ChAprTaskVo {
     /**
      * 评定人员
      */
-    private String EmprealName;
+    private String empRealName;
     /**
      * 评定人员手机号
      */
-    private String EmpTel;
+    private String empTel;
     /**
      * 任务分配时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date assignTime;
     /**
      * 任务接受时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date acceptTime;
     /**
      * 任务完成时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date finishTime;
     /**
      * 任务状态

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

@@ -7,6 +7,8 @@ import java.util.Date;
 
 @Data
 public class ReTaskDistributionVO {
+    // 失能人员信息id
+    private Long disableInfoId;
     //鉴定任务id
     private Integer taskId;
     //任务明细id