添加缺失字段

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

@@ -235,7 +235,12 @@
                push.Distance_station_kilometers                                                                   distanceStationKilometers,
                push.Distance_station_travel_time                                                                  distanceStationTravelTime,
                push.Total_distance                                                                                totalDistance,
-               push.Length_of_time                                                                                lengthOfTime
+               push.Length_of_time                                                                                lengthOfTime,
+               emp.real_name                                                                                      empRealName,
+               emp.certi_code                                                                                     empCertiCode,
+               push.status                                                                                        status,
+               push.Refuse_reason                                                                                 refuseReason,/*拒绝原因*/
+               push.Refuse_remark                                                                                 remark/*备注*/
         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
@@ -247,7 +252,9 @@
     <select id="personInfoList" resultType="com.hungraim.ltc.pojo.vo.assessment.PersonInfoVO">
         SELECT emp.emp_id       empId,
                organ.organ_name orgaName,
-               emp.real_name    realName
+               emp.real_name    realName,
+               emp.tel          tel,
+               emp.certi_code   certiCode
         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

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

@@ -13,4 +13,8 @@ public class PersonInfoVO {
     private String realName;
     //评定人员所属机构
     private String orgaName;
+    //评定人员手机号
+    private String tel;
+    //评定人员身份证号
+    private String certiCode;
 }

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

 package com.hungraim.ltc.pojo.vo.assessment;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 评定任务分组管理列表详情
  */
@@ -14,7 +17,8 @@ public class TaskGroupInfoVO {
     /**
      * 分组日期
      */
-    private String time;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date time;
     /**
      * 组号
      */
@@ -42,9 +46,10 @@ public class TaskGroupInfoVO {
      */
     private String gender;
     /**
-     * 失能人员年龄
+     * 失能人员(出生日期)年龄
      */
-    private String birthday;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
     /**
      * 失能人员身份证号码
      */
@@ -52,11 +57,13 @@ public class TaskGroupInfoVO {
     /**
      * 计划到达时间
      */
-    private String plannedArrivalTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date plannedArrivalTime;
     /**
      * 计划离开时间
      */
-    private String plannedDepartureTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date plannedDepartureTime;
     /**
      * 距离前站(公里数)
      */
@@ -64,9 +71,34 @@ public class TaskGroupInfoVO {
     /**
      * 距离前站行驶时间
      */
-    private String distanceStationTravelTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date distanceStationTravelTime;
     /**
      * 车次总距离
      */
     private String totalDistance;
+    /**
+     * 总时长
+     */
+    private String lengthOfTime;
+    /**
+     * 评定组长姓名
+     */
+    private String empRealName;
+    /**
+     * 评定组长身份证号码
+     */
+    private String empCertiCode;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+    /**
+     * 备注
+     */
+    private String remark;
 }