From 519ab446005d62fcb56afcf55f1df7a230414941 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 24 Apr 2023 17:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=20=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SarBussionessStandState.java                       | 3 +++
 .../entity/SarBussionessStandStatePage.java                   | 3 +++
 .../sarBussionessStandState/SarBussionessStandStateMapper.xml | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java
index 9f09b90d..7c85ce14 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java
@@ -101,4 +101,7 @@ public class SarBussionessStandState extends BaseEntity {
     @TableField(exist = false)
     private String standSort;
 
+    @TableField(exist = false)
+    private String menuId;
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java
index c053d6e7..97498020 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java
@@ -74,5 +74,8 @@ public class SarBussionessStandStatePage extends BasePage {
     private String QCRBUSS;
     private String standSort;
 
+    @ApiModelProperty(value = "标准类别")
+    private String menuId;
+
 
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
index 1a7fb075..97351c0b 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
@@ -114,6 +114,9 @@
             <if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
                 and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
             </if>
+            <if test="QCDW != null and QCDW != '' " >
+                and QCDW like  concat(concat('%',#{QCDW}),'%')
+            </if>
         </trim>
     </sql>
     <sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
@@ -263,6 +266,7 @@
         select count(1) from (
         select distinct sar_bussioness_stand.id  from sar_bussioness_stand
         LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id
+        left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
         <include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss"/>
         ) a
     </select>