From 7594824a7616f87d791b16dfcdbeb16db74c1866 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 10 Jan 2022 17:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=97=A5=E6=9C=9F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarBussionessStandController.java         |  2 +-
 .../entity/SarBussionessStandEOPage.java      | 40 +++++++++++++++++++
 .../da/utils/util/SarAdvanceSearchUtil.java   |  3 +-
 .../SarBussionessStandMapper.xml              | 20 +++++++++-
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index 8cd3b549..89d52e3c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -232,7 +232,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     public ResponseMessage<PageInfo<SarBussionessStand>> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception {
         if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-            String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO");
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_BUSS_STAND_ATTR_INFO");
             if (StringUtils.isNotBlank(advanceStr)) {
                 page.setAdvanceSearchStr(advanceStr);
             } else {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
index 0fc3aec2..ba950ca9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
@@ -22,6 +22,13 @@ public class SarBussionessStandEOPage extends BasePage {
         this.textStatusBuss = textStatusBuss;
     }
 
+    private String startIssueTime;
+    private String endIssueTime;
+    private String startPutTime;
+    private String endPutTime;
+
+
+
     private String modifyTime;
     private String modifyTime1;
     private String modifyTime2;
@@ -1130,4 +1137,37 @@ public class SarBussionessStandEOPage extends BasePage {
     public void setSql(String sql) {
         this.sql = sql;
     }
+
+    public String getStartIssueTime() {
+        return startIssueTime;
+    }
+
+    public void setStartIssueTime(String startIssueTime) {
+        this.startIssueTime = startIssueTime;
+    }
+
+    public String getEndIssueTime() {
+        return endIssueTime;
+    }
+
+    public void setEndIssueTime(String endIssueTime) {
+        this.endIssueTime = endIssueTime;
+    }
+
+
+    public String getStartPutTime() {
+        return startPutTime;
+    }
+
+    public void setStartPutTime(String startPutTime) {
+        this.startPutTime = startPutTime;
+    }
+
+    public String getEndPutTime() {
+        return endPutTime;
+    }
+
+    public void setEndPutTime(String endPutTime) {
+        this.endPutTime = endPutTime;
+    }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java
index 9a090ca9..1b872090 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java
@@ -81,11 +81,12 @@ public class SarAdvanceSearchUtil {
 
 
     /**
-     * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句
+     * 国内外标准高级查询 对tableName表自定义字段生成条件语句
      * @param searchVOList
      * @return
      */
     public static String createStandSql(List<SarAdvanceSearchVO> searchVOList,String tableName) {
+        tableName=tableName+".";
         String sqlInfo = "";
         StringBuilder sqlBuilder = new StringBuilder();
         if (searchVOList != null && !searchVOList.isEmpty()) {
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 982af830..32e525f5 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
@@ -465,9 +465,27 @@
                 and DATE_FORMAT(issue_time,'%Y-%m-%D') &gt;= #{issueTime1}
             </if>
             <if test="issueTime2 != null" >
-                -- and to_char(issue_time,'YYYY-MM-DD') &lt;= #{issueTime2}
                 and DATE_FORMAT(issue_time,'%Y-%m-%D')  &lt;= #{issueTime2}
             </if>
+
+
+            <!--                     日期查询                         -->
+            <if test="startPutTime != null" >
+                and DATE_FORMAT(put_time,'%Y-%m-%d') &gt;= #{startPutTime}
+            </if>
+            <if test="endPutTime != null" >
+                and DATE_FORMAT(put_time,'%Y-%m-%d') &lt;= #{endPutTime}
+            </if>
+            <if test="startIssueTime != null" >
+                and DATE_FORMAT(issue_time,'%Y-%m-%d') &gt;= #{startIssueTime}
+            </if>
+            <if test="endIssueTime != null" >
+                and DATE_FORMAT(issue_time,'%Y-%m-%d')  &lt;= #{endIssueTime}
+            </if>
+
+
+
+
             <!--  目录判断 -->
             <if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null" >
                 and SAR_BUSS_STAND_MENU.MENU_ID in