From 4c4cc558214ef7cfccae7a73c836b6bafac1aa67 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 9 Nov 2022 15:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E4=BA=BA=E5=A7=93=E5=90=8D=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/IcTripReportRecordDTO.java  |  5 ++++
 .../epmet/dto/form/PageTripReportFormDTO.java |  5 ++++
 .../mapper/IcTripReportRecordDao.xml          | 23 +++++++++++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
index e81053a3c0..7796f0f5d8 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
@@ -365,4 +365,9 @@ public class IcTripReportRecordDTO implements Serializable {
      */
     @ExcelIgnore
     private String tripDataTypeName;
+    /**
+     * 上报人姓名(createdBy对应人名)
+     */
+    @ExcelIgnore
+    private String createdByName;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
index 4c2e07b48d..b28e494577 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
@@ -60,4 +60,9 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable {
      */
     private String sojournHistory;
 
+    /**
+     * 隔离状态，字典表(isolate_type)【磐石】
+     */
+    private String isolateType;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
index 63fa414be6..eaf72e3c95 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
@@ -7,9 +7,17 @@
     <select id="selectMyReported" parameterType="map" resultType="com.epmet.dto.IcTripReportRecordDTO">
         SELECT
             r.*,
-            r.CREATED_TIME AS reportTime
+            r.CREATED_TIME AS reportTime,
+            (
+                CASE
+                WHEN r.USER_TYPE = 'resi' THEN IFNULL(ubi.`NAME`, '无')
+                ELSE IFNULL(cs.REAL_NAME, '无')
+                END
+            ) AS createdByName
         FROM
             ic_trip_report_record r
+        LEFT JOIN customer_staff cs on r.user_type != 'resi' AND r.created_by = cs.user_id AND r.customer_id = cs.customer_id
+        LEFT JOIN user_base_info ubi ON r.user_type = 'resi' AND r.created_by = ubi.user_id AND r.customer_id = ubi.customer_id
         WHERE
             r.DEL_FLAG = '0'
             AND r.CUSTOMER_ID = #{customerId}
@@ -29,11 +37,19 @@
             a.ID AS epidemicId,
             r.CREATED_TIME AS reportTime,
             r.ID_CARD as realIdCard,
-            r.MOBILE as realMobile
+            r.MOBILE as realMobile,
+            (
+                CASE
+                WHEN r.USER_TYPE = 'resi' THEN IFNULL(ubi.`NAME`, '无')
+                ELSE IFNULL(cs.REAL_NAME, '无')
+                END
+            ) AS createdByName
         FROM ic_trip_report_record r
         LEFT JOIN (
                 select * from ic_epidemic_special_attention GROUP BY id_card  ORDER BY created_time DESC
             ) a ON (a.ID_CARD = r.ID_CARD AND a.DEL_FLAG = 0 AND a.IS_ATTENTION = 1 AND a.ATTENTION_TYPE = 2)
+        LEFT JOIN customer_staff cs on r.user_type != 'resi' AND r.created_by = cs.user_id AND r.customer_id = cs.customer_id
+        LEFT JOIN user_base_info ubi ON r.user_type = 'resi' AND r.created_by = ubi.user_id AND r.customer_id = ubi.customer_id
         WHERE
             r.DEL_FLAG = '0'
             AND r.CUSTOMER_ID = #{customerId}
@@ -67,6 +83,9 @@
             <if test='null != sojournHistory and "" != sojournHistory'>
                 AND r.sojourn_history = #{sojournHistory}
             </if>
+            <if test='null != isolateType and "" != isolateType'>
+                AND r.isolate_type = #{isolateType}
+            </if>
         ORDER BY
             r.ARRIVE_DATE DESC, r.CREATED_TIME DESC
     </select>