From 8a9971c046b44b31a50e8b2afeda04e65fa28754 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 11 Jan 2022 22:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E4=B8=8E=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandWarning/entity/StandWarningEO.java   |  4 ++--
 .../sarStandWarning/EarlyWraningEOMapper.xml     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
index b1604d9a..26ebd22c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
@@ -83,10 +83,10 @@ public class StandWarningEO extends EarlyWarningEO {
     @ExcelIgnore
     @ApiModelProperty("范围查询发布日期开始")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
-    private String startPutTime;
+    private String startIssueTime;
 
     @ExcelIgnore
     @ApiModelProperty("范围查询发布日期结束")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
-    private String endPutTime;
+    private String endIssueTime;
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
index 494904e7..c84d8a60 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
@@ -9,7 +9,7 @@
         <result column="STAND_TYPE"      property="standType"></result>
         <result column="STAND_CODE"      property="standCode"></result>
         <result column="STAND_NAME"      property="standName"></result>
-        <result column="PUT_TIME"        property="putTime"></result>
+        <result column="ISSUE_TIME" property="issueTime"></result>
         <result column="APPLY_TYPE"      property="applyType"></result>
         <result column="DUTY_ENGINEER"   property="dutyEngineer"></result>
         <result column="ITEMS_ID"        property="itemsId"></result>
@@ -31,7 +31,7 @@
         	sarInfo.STAND_TYPE,
         	CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
         	sarInfo.STAND_NAME,
-        	sarInfo.PUT_TIME,
+        	sarInfo.ISSUE_TIME,
             attr.SSRQ as SSRQ
     </sql>
 
@@ -50,15 +50,15 @@
         <if test="waringEO.standName != null and waringEO.standName != ''">
             AND sarInfo.STAND_NAME like  concat('%', #{waringEO.standName},'%')
         </if>
-        <if test="waringEO.startPutTime != null and waringEO.startPutTime != '' and waringEO.endPutTime != null and waringEO.endPutTime != '' ">
+        <if test="waringEO.startIssueTime != null and waringEO.startIssueTime != '' and waringEO.endIssueTime != null and waringEO.endIssueTime != '' ">
             AND (
-            DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
-            #{waringEO.endPutTime},
+            DATE_FORMAT(sarInfo.ISSUE_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
+            #{waringEO.startIssueTime},
             '%Y-%m-%d'
             )
             AND
-            DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-            #{waringEO.endPutTime},
+            DATE_FORMAT( sarInfo.ISSUE_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
+            #{waringEO.endIssueTime},
             '%Y-%m-%d'
             )
             )
@@ -79,7 +79,7 @@
         	sarInfo.STAND_TYPE,
         	CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
         	sarInfo.STAND_NAME,
-        	sarInfo.PUT_TIME,
+        	sarInfo.ISSUE_TIME,
             attr.SSRQ as SSRQ,
             case stand_type
             when 'INLAND' then '国内标准'