From ec00f49fae3d82f4c127fe44fae4eae0b0402e08 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 14 Oct 2021 17:38:21 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TripReportController.java      |  2 +-
 .../modules/epidemic/dao/TripReportDao.java   | 15 +++++++++
 .../epidemic/service/TripReportService.java   |  2 ++
 .../service/impl/TripReportServiceImpl.java   | 18 +++++++----
 .../mapper/epidemic/TripReportDao.xml         | 32 ++++++++++++++++++-
 5 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java
index d61ebce..0b7b931 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java
@@ -53,7 +53,7 @@ public class TripReportController {
 
     @GetMapping("page")
     public Result<PageData<TripReportDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<TripReportDTO> page = tripReportService.page(params);
+        PageData<TripReportDTO> page = tripReportService.getPageList(params);
         return new Result<PageData<TripReportDTO>>().ok(page);
     }
 
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java
index 4624bd1..78e6563 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java
@@ -20,10 +20,14 @@ package com.elink.esua.epdc.modules.epidemic.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
 import com.elink.esua.epdc.dto.TripListDTO;
+import com.elink.esua.epdc.dto.TripReportDTO;
+import com.elink.esua.epdc.dto.TripReportDetailDTO;
 import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 行程上报信息
@@ -42,4 +46,15 @@ public interface TripReportDao extends BaseDao<TripReportEntity> {
     * @return java.util.List<com.elink.esua.epdc.dto.TripListDTO>
     */
     List<TripListDTO> getTripInfoList(GetTripInfoFormDTO formDto);
+
+    List<TripReportDTO> getPageList(Map<String, Object> params);
+
+    /**
+    * @describe: 小程序获取上报详情
+    * @author wangtong
+    * @date 2021/10/14 17:29
+    * @params [id]
+    * @return com.elink.esua.epdc.dto.TripReportDetailDTO
+    */
+    TripReportDetailDTO selectDetailById(@Param("id") String id);
 }
\ No newline at end of file
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java
index ccb3ad6..a1af4fa 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java
@@ -131,4 +131,6 @@ public interface TripReportService extends BaseService<TripReportEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result deleteTripById(GetTripInfoFormDTO formDto);
+
+    PageData<TripReportDTO> getPageList(Map<String, Object> params);
 }
\ No newline at end of file
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
index 4d84a13..c637bf9 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
@@ -25,10 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.GetTripInfoFormDTO;
-import com.elink.esua.epdc.dto.SaveTripInfoFormDTO;
-import com.elink.esua.epdc.dto.TripListDTO;
-import com.elink.esua.epdc.dto.TripReportDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.modules.epidemic.dao.TripReportDao;
 import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity;
 import com.elink.esua.epdc.modules.epidemic.redis.TripReportRedis;
@@ -65,6 +62,13 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
         return getPageData(page, TripReportDTO.class);
     }
 
+    @Override
+    public PageData<TripReportDTO> getPageList(Map<String, Object> params) {
+        IPage<TripReportDTO> page = getPage(params);
+        List<TripReportDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<TripReportDTO> list(Map<String, Object> params) {
         List<TripReportEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -128,8 +132,8 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
     @Override
     public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
         log.info("formDto:"+formDto);
-        TripReportEntity entity = selectById(formDto.getId());
-        return new Result().ok(entity);
+        TripReportDetailDTO result = baseDao.selectDetailById(formDto.getId());
+        return new Result().ok(result);
     }
 
     @Override
@@ -145,4 +149,6 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
 
     }
 
+
+
 }
\ No newline at end of file
diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml
index 509fcd1..8d1017c 100644
--- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml
@@ -36,7 +36,7 @@
     <select id="getTripInfoList" resultType="com.elink.esua.epdc.dto.TripListDTO">
         select id,
              name,
-             REPLACE(COME_ADDRESS_NAME,',','/') as comeAddressName,
+             SUBSTRING_INDEX(COME_ADDRESS_NAME,'-',3) AS comeAddressName,
              date_format(CREATED_TIME,'%Y-%m-%d %H:%i') as createdTime
         from epdc_trip_report
         where DEL_FLAG='0'
@@ -44,6 +44,36 @@
         order by CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>
+    <select id="getPageList" resultType="com.elink.esua.epdc.dto.TripReportDTO">
+        SELECT  *
+        FROM `epdc_trip_report`
+        where DEL_FLAG='0'
+        <if test="name != null and name != ''">
+            and name like '%${name}%'
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and mobile like '%${mobile}%'
+        </if>
+        <if test="idCard != null and idCard != ''">
+            and ID_CARD like '%${idCard}%'
+        </if>
+        <if test="comeCode != null and comeCode != ''">
+            and FIND_IN_SET(#{comeCode},COME_ADDRESS_CODE)
+        </if>
+        <if test="nowCode != null and nowCode != ''">
+            and FIND_IN_SET(#{nowCode},NOW_ADDRESS_CODE)
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        order by CREATED_TIME desc
+
+
+    </select>
+    <select id="selectDetailById" resultType="com.elink.esua.epdc.dto.TripReportDetailDTO">
+        select * from epdc_trip_report
+        where id=#{id}
+    </select>
 
 
 </mapper>
\ No newline at end of file