复评申请-历史任务评定信息列表

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

 package com.hungraim.ltc.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.vo.assessment.ChAprTaskVo;
 import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
 import com.hungraim.ltc.service.ReTaskService;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 复评Controller
  *
@@ -57,5 +60,14 @@ public class ReTaskController {
         }
         return Result.failed("没有查到该复评申请数据");
     }
+    /**
+     * 复评申请-历史评定信息
+     */
+    @GetMapping("/retask-hisinfo-list")
+    public Result<List<ChAprTaskVo>> getRetaskHisList(){
+        List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList();
+        return Result.success(chAprTaskVos);
+    }
+
 
 }

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import com.hungraim.ltc.pojo.vo.assessment.ChAprTaskVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 复评
+ */
+@Mapper
+@Repository
+public interface ReTaskMapper extends BaseMapper<ChAprTask> {
+    /**
+     * 复评任务评定信息列表
+     */
+    List<ChAprTaskVo> getReTaskHisInfoList();
+}

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

@@ -3,10 +3,13 @@ package com.hungraim.ltc.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import com.hungraim.ltc.pojo.vo.assessment.ChAprTaskVo;
 import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 复评Service
  *
@@ -19,5 +22,9 @@ public interface ReTaskService extends IService<ChAprTask> {
      * 复评申请详情
      */
     ChDisableApplyVo reassmentDetailById(String applyId);
+    /**
+     * 复评申请-历史评定信息列表查询
+     */
+    List<ChAprTaskVo> geReTaskHisInfoList();
 
 }

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

@@ -4,16 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hungraim.ltc.api.OrganFeignService;
 import com.hungraim.ltc.dao.ChDisableApplyMapper;
+import com.hungraim.ltc.dao.ReTaskMapper;
 import com.hungraim.ltc.dao.TaskMapper;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.vo.assessment.ChAprTaskVo;
 import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
 import com.hungraim.ltc.service.ReTaskService;
+import com.hungraim.ltc.util.DateUtils;
 import com.hungraim.ltc.util.Result;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,12 +27,12 @@ import java.util.List;
 @Service
 @Slf4j
 @AllArgsConstructor
-public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implements  ReTaskService {
+public abstract class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implements  ReTaskService {
     private final TaskMapper taskMapper;
     private final OrganFeignService organFeignService;
     private final ChDisableApplyMapper disableApplyMapper;
     private final ChDisableApplyMapper chDisableApplyMapper;
-
+    private final ReTaskMapper reTaskMapper;
     @Override
     public Page<ReTaskDistributionVO> reTaskDistributionList(Page<ReTaskDistributionVO> page, Long organId, Boolean isIncluded, String acptProvincial, String acptCity, String acptCrea, String realName, String certiCode) {
         Result<List<Long>> organChild = null;

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

@@ -8,7 +8,7 @@
         apply.ORGAN_ID organId,
         fndOrgan.ORGAN_NAME organName,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_PROVINCIAL= dis.DISTRICT_CODE) districtProvincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_CITY = dis.DISTRICT_CODE) districPity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_CITY = dis.DISTRICT_CODE) districtCity,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_AREA = dis.DISTRICT_CODE) districtArea,
         (select STREET_NAME from CH_FND_STREET dis where apply.ACPT_STREET=dis.STREET_CODE)acptStreet,
         apply.REAL_NAME realName,apply.CERTI_CODE certiCode,apply.BIRTHDAY birthday,apply.GENDER gender,apply.TEL tel,

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hungraim.ltc.dao.ReTaskMapper">
+
+    <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.ORGAN_ID organId,
+            (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) districtCity,
+            (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
+            disinfo.REAL_NAME realName,
+            apply.EFF_TIME effTime,
+            disinfo.CERTI_CODE certiCode,
+            disinfo.BIRTHDAY birthDay,
+            (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE disease where disinfo.DISEASE=disease.DISE_TYPE_ID) disease,
+            disinfo.TEL tel,
+            (select DISTRICT_NAME from CH_FND_DISTRICT dis where disinfo.ACPT_PROVINCIAL= dis.DISTRICT_CODE) acptProvincial,
+            (select DISTRICT_NAME from CH_FND_DISTRICT dis where disinfo.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
+            (select DISTRICT_NAME from CH_FND_DISTRICT dis where disinfo.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
+            (select STREET_NAME from CH_FND_STREET dis where disinfo.ACPT_STREET=dis.STREET_CODE)acptStreet,
+            (select STREET_NAME from CH_FND_STREET dis where disinfo.ACPT_ADDRESS=dis.STREET_CODE)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,
+            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_DISABLE_APPLY apply on task.APPLY_ID=apply.APPLY_ID
+                 left join CH_APR_TASK_EMP taskEmp on task.TASK_ID=taskEmp.TASK_ID
+    </select>
+
+</mapper>
\ No newline at end of file

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

+package com.hungraim.ltc.pojo.vo.assessment;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 评定任务信息列表
+ */
+@Data
+public class ChAprTaskVo {
+    /**
+     * 适用机构
+     */
+    private String organName;
+    /**
+     * 机构代码
+     */
+    private String organId;
+    /**
+     * 所在省市
+     */
+    private String districtProvincial;
+    private String districtCity;
+    private String districtArea;
+    private String provincialCityArea;
+    /**
+     * 失能人员姓名
+     */
+    private String realName;
+    /**
+     * 申请日期
+     */
+    private Date effTime;
+    /**
+     * 省份证号码
+     */
+    private String certiCode;
+    /**
+     * 年龄
+     */
+    private Date birthDay;
+    private Integer age;
+    /**
+     * 诊断疾病
+     */
+    private String disease;
+    /**
+     * 联系电话
+     */
+    private String tel;
+    /**
+     * 接受评定地址
+     */
+    private String acptProvincial;
+    private String acptCity;
+    private String acptArea;
+    private String acptStreet;
+    private String acptAddress;
+    private String pcasd;
+    /**
+     * 评定人员
+     */
+    private String EmprealName;
+    /**
+     * 评定人员手机号
+     */
+    private String EmpTel;
+    /**
+     * 任务分配时间
+     */
+    private Date assignTime;
+    /**
+     * 任务接受时间
+     */
+    private Date acceptTime;
+    /**
+     * 任务完成时间
+     */
+    private Date finishTime;
+    /**
+     * 任务状态
+     */
+    private Integer taskStatus;
+}