Merge remote-tracking branch 'origin/develop_1' into develop_1

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;
 

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">

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}),'%')