修改报告鉴定人员

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

@@ -110,7 +110,7 @@ public class TaskServiceImpl implements TaskService {
         chAprReport.setEvaluateTime(evaluateDate);
         aprReportMapper.updateById(chAprReport);
         //修改鉴定报告人员(有就update,没有就insert)
-        List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", reportId));
+        List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", reportId).orderByDesc("info_id"));
         if (person1 != null) {
             if (personInfos.size() >= 1) {
                 ChAprPersonInfo personInfo = personInfos.get(0);
@@ -126,7 +126,7 @@ public class TaskServiceImpl implements TaskService {
         }
         if (person2 != null) {
             if (personInfos.size() >= 2) {
-                ChAprPersonInfo personInfo = personInfos.get(0);
+                ChAprPersonInfo personInfo = personInfos.get(1);
                 personInfo.setEmpId(person2);
                 personInfoMapper.updateById(personInfo);
             } else {
@@ -139,7 +139,7 @@ public class TaskServiceImpl implements TaskService {
         }
         if (person3 != null) {
             if (personInfos.size() >= 3) {
-                ChAprPersonInfo personInfo = personInfos.get(0);
+                ChAprPersonInfo personInfo = personInfos.get(2);
                 personInfo.setEmpId(person3);
                 personInfoMapper.updateById(personInfo);
             } else {

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

@@ -14,8 +14,8 @@
         disable.real_name realName,
         task.fcd fcd,
         disable.certi_code certiCode,
-        task.pol_no polNo,
-        task.remark remark,
+        report.pol_no polNo,
+        report.remark remark,
         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,
@@ -53,6 +53,7 @@
         left join ch_apr_emp emp on task.apr_emp_id = emp.emp_id and emp.IS_LOCK = 0
         left join ch_apr_task_push push on task.task_id = push.task_id
         left join ch_apr_task_emp cate on task.task_id = cate.task_id
+        left join ch_apr_report report on report.TASK_ID = task.TASK_ID
         <where>
             <if test="organIds != null">
                 and task.apr_organ_id in
@@ -110,8 +111,8 @@
         report.disable_level_id disableLevelId,
         info.REAL_NAME realName,
         info.CERTI_CODE certiCode,
-        task.pol_no polNo,
-        task.remark remark,
+        report.pol_no polNo,
+        report.remark remark,
         info.birthday birthday,
         (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
         (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
@@ -233,11 +234,13 @@
                push.Planned_departure_time                                                                        plannedDepartureTime,
                push.Distance_station_kilometers                                                                   distanceStationKilometers,
                push.Distance_station_travel_time                                                                  distanceStationTravelTime,
-               push.Total_distance                                                                                totalDistance
+               push.Total_distance                                                                                totalDistance,
+               push.Length_of_time                                                                                lengthOfTime
         from ch_apr_task_push push
                  left join ch_apr_task task on push.task_id = task.task_id
                  left join CH_FND_ORGAN organ on organ.organ_id = task.organ_id
                  left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
+                 left join ch_apr_emp emp on emp.emp_id = push.emp_id
         where push.group_number = #{groupNumber}
     </select>
 
@@ -249,6 +252,7 @@
                  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}
+        order by info.info_id desc
     </select>
 
 </mapper>
\ No newline at end of file