查询失能人员列表

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

 package com.hungraim.ltc.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
 import com.hungraim.ltc.service.TaskService;
@@ -63,4 +64,13 @@ public class TaskController {
         return Result.success(taskReportList);
     }
 
+    /**
+     * 查询失能人员列表
+     */
+    @RequestMapping("/aprEmpList")
+    public Result<List<ChAprEmp>> aprEmpList() {
+        List<ChAprEmp> chAprEmps = taskService.aprEmpList();
+        return Result.success(chAprEmps);
+    }
+
 }

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能评定人员Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface AprEmpMapper extends BaseMapper<ChAprEmp> {
+}

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

 package com.hungraim.ltc.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
 import org.springframework.stereotype.Service;
@@ -42,4 +43,6 @@ public interface TaskService {
      * 评定报告录入列表
      */
     List<TaskReportVO> taskReportList();
+
+    List<ChAprEmp> aprEmpList();
 }

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

 package com.hungraim.ltc.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.dao.AprEmpMapper;
 import com.hungraim.ltc.dao.TaskMapper;
+import com.hungraim.ltc.pojo.entity.eval.ChAprEmp;
 import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
 import com.hungraim.ltc.service.TaskService;
@@ -13,11 +16,16 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @author czz
+ */
 @Service
 public class TaskServiceImpl implements TaskService {
 
     @Autowired
     private TaskMapper taskMapper;
+    @Autowired
+    private AprEmpMapper aprEmpMapper;
 
     @Override
     public IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
@@ -36,4 +44,9 @@ public class TaskServiceImpl implements TaskService {
     public List<TaskReportVO> taskReportList() {
         return taskMapper.taskReportList();
     }
+
+    @Override
+    public List<ChAprEmp> aprEmpList() {
+        return aprEmpMapper.selectList(new QueryWrapper<ChAprEmp>().eq("IS_LOCK", 0));
+    }
 }
\ No newline at end of file

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

@@ -14,6 +14,7 @@
         disable.real_name realName,
         task.fcd fcd,
         disable.certi_code certiCode,
+        disable.BIRTHDAY birthday,
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
         disable.tel tel,

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprEmp.java

+package com.hungraim.ltc.pojo.entity.eval;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("CH_APR_EMP")
+public class ChAprEmp {
+    private Integer empId;
+    private Integer eduId;
+    private String aprempTypeNameF;
+    private String certiCode;
+    private Integer isLock;
+    private String certifTypeCode;
+    private String eduCode;
+    private Integer basicEmpId;
+    private java.util.Date endTime;
+    private String gender;
+    private Integer defineEmp;
+    private Integer cfgModeId;
+    private Integer age;
+    private Integer aprempTypeIdF;
+    private java.util.Date fcd;
+    private Integer empType;
+    private java.util.Date lcd;
+    private String realName;
+    private Integer aprempTypeIdS;
+    private String aprempTypeNameS;
+    private Integer dataFrom;
+    private Integer endEmp;
+    private String address;
+    private Integer fcu;
+    private String tel;
+    private String certifTypeId;
+    private Integer groupLeader;
+    private java.util.Date effTime;
+    private Integer aprOrganId;
+    private Integer lcu;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/eval/ChAprTask.java

@@ -20,7 +20,7 @@ public class ChAprTask {
     private java.util.Date taskAppointmentDate;
     private Integer defineEmp;
     private Integer finishEmp;
-    private java.util.Date fCD;
+    private java.util.Date fcd;
     private Integer acceptEmp;
     private java.util.Date acceptTime;
     private java.util.Date lcd;

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

@@ -27,6 +27,8 @@ public class TaskDistributionVO {
     //失能人员身份证号码
     private String certiCode;
     //年龄
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;//出生年月
     //诊断疾病 CH_FND_DISEASE_TYPE
     private String diseTypeF;//大类
     private String diseTypeS;//小类