From 0630c99b0b4b34c7574dbc7673d1ed4ad3290f34 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Mon, 27 Sep 2021 16:33:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BC=A0=E7=BB=99=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java | 7 ++++++-
 .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java
index c1268581..cf488f68 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandItems.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -22,9 +23,13 @@ public class SarStandItemsDto {
     @ApiModelProperty(value = "条目编号")
     private String itemsNum;
 
-    @ApiModelProperty(value = "内容")
+    @ApiModelProperty(value = "名称")
     private String itemsName;
 
+    @ApiModelProperty(value = "内容")
+    @TableField("TERMS_CONDITIONS")
+    private String termsConditions;
+
     @ApiModelProperty(value = "责任部门")
     private String responsibleUnit;
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
index 32a31e9c..a847efc6 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
@@ -731,7 +731,7 @@
 
 
     <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
-        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,TERMS_CONDITIONS as termsConditions,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
         from SAR_STAND_ITEMS
         where FILE_TYPE=#{type}
         <if test="ids != null">

From 04a07687c6866a5e0bb45f769d9453b2b33217aa Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Mon, 27 Sep 2021 17:11:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 661b3184..859f692d 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -408,6 +408,9 @@
             <!-- 标准名称 -->
             <if test="standName != null and standName != ''">
                 and stand_name like concat(concat('%',#{standName}),'%')
+                or STAND_NUMBER like concat(concat('%',#{standName}),'%')
+                or STAND_YEAR like concat(concat('%',#{standName}),'%')
+                or STAND_SORT like concat(concat('%',#{standName}),'%')
             </if>
             <if test="standEnName != null and standEnName != ''">
                 and stand_en_name like concat(concat('%',#{standEnName}),'%')