通过报告id查询评定报告人员信息

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.assessment.ChAprPersonInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
-import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
+import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
@@ -88,8 +84,8 @@ public class TaskController {
      * @param reportId 评定报告id
      */
     @RequestMapping("/personInfoList")
-    public Result<List<ChAprPersonInfo>> personInfoList(String reportId) {
-        List<ChAprPersonInfo> list = taskService.personInfoList(reportId);
+    public Result<List<PersonInfoVO>> personInfoList(String reportId) {
+        List<PersonInfoVO> list = taskService.personInfoList(reportId);
         return Result.success(list);
     }
 

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

@@ -3,10 +3,7 @@ package com.hungraim.ltc.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
-import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
+import com.hungraim.ltc.pojo.vo.assessment.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -49,4 +46,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
     List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
 
     List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader);
+
+    List<PersonInfoVO> personInfoList(String reportId);
 }

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.assessment.ChAprPersonInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
-import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
+import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.util.Result;
 import org.springframework.stereotype.Service;
 
@@ -67,5 +63,5 @@ public interface TaskService {
 
     List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList();
 
-    List<ChAprPersonInfo> personInfoList(String reportId);
+    List<PersonInfoVO> personInfoList(String reportId);
 }

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

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.dao.*;
 import com.hungraim.ltc.pojo.entity.assessment.*;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
-import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
-import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
+import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.SerialNumberUtils;
@@ -205,7 +202,7 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public List<ChAprPersonInfo> personInfoList(String reportId) {
-        return personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", reportId));
+    public List<PersonInfoVO> personInfoList(String reportId) {
+        return taskMapper.personInfoList(reportId);
     }
 }
\ No newline at end of file

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

@@ -191,4 +191,14 @@
         </where>
     </select>
 
+    <select id="personInfoList" resultType="com.hungraim.ltc.pojo.vo.assessment.PersonInfoVO">
+        SELECT emp.emp_id       empId,
+               organ.organ_name orgaName,
+               emp.real_name    realName
+        FROM ch_apr_person_info info
+                 LEFT JOIN ch_apr_emp emp ON info.emp_id = emp.emp_id
+                 LEFT JOIN ch_apr_organ organ ON organ.apr_organ_id = emp.apr_organ_id
+        where info.report_id = #{reportId}
+    </select>
+
 </mapper>
\ No newline at end of file

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

+package com.hungraim.ltc.pojo.vo.assessment;
+
+import lombok.Data;
+
+/**
+ * 评定报告录入列表
+ */
+@Data
+public class PersonInfoVO {
+    //评定人员id
+    private String empId;
+    //评定人员姓名
+    private String realName;
+    //评定人员所属机构
+    private String orgaName;
+}