From ef533b8c3708a36e16ea8a638074ff1fa9ae8ac4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 16 May 2023 14:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BC=80=E5=A7=8B=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E3=80=81=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E3=80=81?=
 =?UTF-8?q?=E5=8A=9E=E7=BB=93=E5=BC=80=E5=A7=8B=E3=80=81=E5=8A=9E=E7=BB=93?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ingshanOfficeHallServiceRecordPageFormDTO.java | 15 +++++++++++++--
 .../dao/LingshanOfficeHallServiceRecordDao.java   |  6 ++++--
 ...ingshanOfficeHallServiceRecordServiceImpl.java |  7 ++++++-
 .../mapper/LingshanOfficeHallServiceRecordDao.xml | 14 ++++++++++----
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/LingshanOfficeHallServiceRecordPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/LingshanOfficeHallServiceRecordPageFormDTO.java
index 9f6102afff..2edc3a6b2b 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/LingshanOfficeHallServiceRecordPageFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/lingshan/LingshanOfficeHallServiceRecordPageFormDTO.java
@@ -24,16 +24,27 @@ public class LingshanOfficeHallServiceRecordPageFormDTO extends PageFormDTO {
      * 满意度评价。-1不满意，0基本满意，1非常满意
      */
     private Integer satisfication;
+
+    /**
+     * 申请开始日期
+     */
+    private String applicantStartDate;
+
+    /**
+     * 申请结束日期
+     */
+    private String applicantEndDate;
+
     /**
      * 办结日期
      */
     // @DateTimeFormat(pattern = "yyyy-MM-dd")
     // @JsonFormat(pattern = "yyyy-MM-dd")
-    private String startDate;
+    private String closeStartDate;
 
     // @DateTimeFormat(pattern = "yyyy-MM-dd")
     // @JsonFormat(pattern = "yyyy-MM-dd")
-    private String endDate;
+    private String closeEndDate;
 
     /**
      * 未办结：0；已办结：1
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LingshanOfficeHallServiceRecordDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LingshanOfficeHallServiceRecordDao.java
index 51cc8bc63b..d19c69460d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LingshanOfficeHallServiceRecordDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LingshanOfficeHallServiceRecordDao.java
@@ -22,7 +22,9 @@ public interface LingshanOfficeHallServiceRecordDao extends BaseDao<LingshanOffi
                                                       @Param("categoryCode") String categoryCode,
                                                       @Param("content") String content,
                                                       @Param("satisfication") Integer satisfication,
-                                                      @Param("startDate") String startDate,
-                                                      @Param("endDate") String endDate,
+                                                      @Param("applicantStartDate") String applicantStartDate,
+                                                      @Param("applicantEndDate") String applicantEndDate,
+                                                      @Param("closeStartDate") String closeStartDate,
+                                                      @Param("closeEndDate") String closeEndDate,
                                                       @Param("status") String status);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingshanOfficeHallServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingshanOfficeHallServiceRecordServiceImpl.java
index eff9ef11c3..565d54dae3 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingshanOfficeHallServiceRecordServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingshanOfficeHallServiceRecordServiceImpl.java
@@ -61,7 +61,12 @@ public class LingshanOfficeHallServiceRecordServiceImpl extends BaseServiceImpl<
         }
         String orgIdPath = queryOrgIdPath(formDTO.getCustomerId(), formDTO.getStaffId(), formDTO.getOrgId(), formDTO.getOrgType());
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-        List<LingshanOfficeHallServiceRecordDTO> resultList = baseDao.pageList(formDTO.getCustomerId(), orgIdPath, formDTO.getCategoryCode(), formDTO.getContent(), formDTO.getSatisfication(), formDTO.getStartDate(), formDTO.getEndDate(), formDTO.getStatus());
+        List<LingshanOfficeHallServiceRecordDTO> resultList = baseDao.pageList(formDTO.getCustomerId(), orgIdPath,
+                formDTO.getCategoryCode(), formDTO.getContent(),
+                formDTO.getSatisfication(),
+                formDTO.getApplicantStartDate(), formDTO.getApplicantEndDate(),
+                formDTO.getCloseStartDate(), formDTO.getCloseEndDate(),
+                formDTO.getStatus());
         if (CollectionUtils.isNotEmpty(resultList)) {
             Result<Map<String, String>> categoryRes = adminOpenFeignClient.dictMap(DictTypeEnum.LINGSHAN_OFFICE_HALL_SERVICE_RECORD.getCode());
             resultList.forEach(dto -> {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LingshanOfficeHallServiceRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LingshanOfficeHallServiceRecordDao.xml
index 2b09eaf521..47beac5b32 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LingshanOfficeHallServiceRecordDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LingshanOfficeHallServiceRecordDao.xml
@@ -31,11 +31,17 @@
         <if test="status != null and status != ''">
             and r.STATUS = #{status}
         </if>
-        <if test='startDate != null and startDate != "" '>
-            AND DATE_FORMAT(r.CLOSE_TIME,'%Y-%m-%d') >= #{startDate}
+        <if test='applicantStartDate != null and applicantStartDate != "" '>
+            AND DATE_FORMAT(r.APPLICANT_TIME,'%Y-%m-%d') >= #{applicantStartDate}
         </if>
-        <if test='endDate != null and endDate != "" '>
-            AND DATE_FORMAT(r.CLOSE_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        <if test='applicantEndDate != null and applicantEndDate != "" '>
+            AND DATE_FORMAT(r.APPLICANT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{applicantEndDate}
+        </if>
+        <if test='closeStartDate != null and closeStartDate != "" '>
+            AND DATE_FORMAT(r.CLOSE_TIME,'%Y-%m-%d') >= #{closeStartDate}
+        </if>
+        <if test='closeEndDate != null and closeEndDate != "" '>
+            AND DATE_FORMAT(r.CLOSE_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{closeEndDate}
         </if>
         ORDER BY R.CREATED_TIME DESC
     </select>