From 4be04ee92aaac9bffc2d7538459496369a9407f7 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 29 Nov 2023 19:26:16 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=E5=AE=9E=E6=96=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/StandSystemDTO.java                | 26 +++++++++++++++++++
 .../SarStandMenu/SarStandMenuMapper.xml       | 13 ++++++----
 2 files changed, 34 insertions(+), 5 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 8e2f01ee..1db209a6 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
@@ -85,6 +85,11 @@ public class StandSystemDTO {
     @ApiModelProperty(value = "开始实施日期")
     private Date startImplementDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开始实施日期")
+    private String startImplementDateString;
+
     @Excel(name = "实施日期", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -96,6 +101,11 @@ public class StandSystemDTO {
     @ApiModelProperty(value = "结束实施日期")
     private Date endImplementDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "结束实施日期")
+    private String endImplementDateString;
+
     @Excel(name = "代替标准", width = 25, orderNum = "5")
     @ApiModelProperty(value = "代替标准")
     private String replaceStandardNo;
@@ -167,6 +177,22 @@ public class StandSystemDTO {
         }
     }
 
+    public void setStartImplementDate(Date startImplementDate) {
+        this.startImplementDate = startImplementDate;
+        if (startImplementDate != null) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            this.startImplementDateString = sdf.format(startImplementDate);
+        }
+    }
+
+    public void setEndImplementDate(Date endImplementDate) {
+        this.endImplementDate = endImplementDate;
+        if (endImplementDate != null) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            this.endImplementDateString = sdf.format(endImplementDate);
+        }
+    }
+
     public void setStandSystemId(String standSystemId) {
         this.standSystemId = standSystemId;
         if (StrUtil.isNotBlank(standSystemId)) {
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 f6ec0123..bc301c9c 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
@@ -186,7 +186,10 @@
                 WHEN gb.ISSUE_TIME = '' THEN NULL
             ELSE gb.ISSUE_TIME
                 END AS releaseDate,
-            gb.PUT_TIME AS implementDate,
+            CASE
+                WHEN gba.SSRQ = '' THEN NULL
+            ELSE gba.SSRQ
+                END AS implementDate,
             gb.REPLACE_STAND_NUM AS replaceStandardNo,
             gba.QCDW AS dept,
             gba.WSSMR AS draftUserName,
@@ -231,11 +234,11 @@
             AND gb.ISSUE_TIME &lt;= CONCAT(#{param.endReleaseDateString}, ' 23:59:59')
         </if>
         <!-- 实施日期 -->
-        <if test="param.startImplementDate != null">
-            AND gb.PUT_TIME >= #{param.startImplementDate}
+        <if test="param.startImplementDateString != null and param.startImplementDateString != ''">
+            AND gba.SSRQ >= #{param.startImplementDateString}
         </if>
-        <if test="param.endImplementDate != null">
-            AND gb.PUT_TIME &lt;= CONCAT(#{param.endImplementDate}, ' 23:59:59')
+        <if test="param.endImplementDateString != null and param.endImplementDateString != '' ">
+            AND gba.SSRQ &lt;= CONCAT(#{param.endImplementDateString}, ' 23:59:59')
         </if>
         <!--代替标准-->
         <if test="param.replaceStandardNo != null and param.replaceStandardNo != ''">