From 8430e92b2b0287060eaf2a8afb9522ac97120815 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 16 Nov 2023 14:35:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/StandSystemDTO.java                | 27 +++++++++++++++++++
 .../SarStandMenu/SarStandMenuMapper.xml       | 11 +++++---
 .../SarBussionessStandMapper.xml              |  4 +++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
index d4be4c8b..7a755235 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -45,6 +46,11 @@ public class StandSystemDTO {
     @ApiModelProperty(value = "开始发布日期")
     private Date startReleaseDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开始发布日期字符串")
+    private String startReleaseDateString;
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "发布日期")
@@ -55,6 +61,11 @@ public class StandSystemDTO {
     @ApiModelProperty(value = "结束发布日期")
     private Date endReleaseDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "结束发布日期字符串")
+    private String endReleaseDateString;
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "开始实施日期")
@@ -117,4 +128,20 @@ public class StandSystemDTO {
         this.selectIds = selectIds;
         this.selectIdList = java.util.Arrays.asList(selectIds.split(","));
     }
+
+    public void setStartReleaseDate(Date startReleaseDate) {
+        this.startReleaseDate = startReleaseDate;
+        if (startReleaseDate != null) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            this.startReleaseDateString = sdf.format(startReleaseDate);
+        }
+    }
+
+    public void setEndReleaseDate(Date endReleaseDate) {
+        this.endReleaseDate = endReleaseDate;
+        if (endReleaseDate != null) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            this.endReleaseDateString = sdf.format(endReleaseDate);
+        }
+    }
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
index fa7d9c2d..a2aec6af 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
@@ -199,8 +199,9 @@
             AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
         </if>
         <!--发布时间-->
-        <if test="param.startReleaseDate != null and param.endReleaseDate != ''">
-            AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate}
+        <if test="param.startReleaseDateString != null and param.startReleaseDateString != '' and
+                  param.endReleaseDateString != null and param.endReleaseDateString != ''">
+            AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDateString} AND #{param.endReleaseDateString}
         </if>
         <!--实施日期-->
         <if test="param.startImplementDate != null and param.endImplementDate != ''">
@@ -218,8 +219,12 @@
         <if test="param.draftUserName != null and param.draftUserName != ''">
             AND gba.WSSMR LIKE CONCAT('%',#{param.draftUserName},'%')
         </if>
-        <!--数据来源-->
+        <!--搜索条件数据来源-->
         <if test="param.dataSource != null and param.dataSource != ''">
+            AND gb.STAND_TYPE = #{param.dataSource}
+        </if>
+        <!--SQL复用数据来源-->
+        <if test="dataSource != null and dataSource != ''">
             AND gb.STAND_TYPE = #{dataSource}
         </if>
         <if test="param.selectIdList != null and param.selectIdList.size() > 0">
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index 67809d70..f271b2f1 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -1341,6 +1341,10 @@
             <if test="param.draftUserName != null and param.draftUserName != ''">
                 AND esa.QCRBUSS LIKE CONCAT('%',#{param.draftUserName},'%')
             </if>
+            <!--数据来源-->
+            <if test="param.dataSource != null and param.dataSource != ''">
+                AND 'ENTERPRISE' = #{param.dataSource}
+            </if>
             <if test="param.selectIdList != null and param.selectIdList.size() > 0">
                 AND es.ID IN
                 <foreach item="item" index="index" collection="param.selectIdList" open="(" separator="," close=")">