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

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -111,5 +111,9 @@ public class EsRevisePlan extends BasePage {
     @TableField("technologic")
     private String technologic;
 
+    @ApiModelProperty(value = "企标类别")
+    @TableField("buss_sort")
+    private String bussSort;
+
 
 }

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -73,7 +73,8 @@
         <result property="isRelate" column="is_relate"/>
         <result property="useLevel" column="use_level"/>
         <result property="technologic" column="technologic"/>
-   </resultMap>
+        <result property="bussSort" column="buss_sort"/>
+    </resultMap>
     <!--    查询条件-->
     <sql id="Conditions">
         <where>
@@ -137,6 +138,7 @@
         es_revise_plan.is_relate,
         es_revise_plan.use_level,
         es_revise_plan.technologic,
+        es_revise_plan.buss_sort,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
@@ -204,6 +206,7 @@
         es_revise_plan.is_relate,
         es_revise_plan.use_level,
         es_revise_plan.technologic,
+        es_revise_plan.buss_sort,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
@@ -271,6 +274,7 @@
         es_revise_plan.is_relate,
         es_revise_plan.use_level,
         es_revise_plan.technologic,
+        es_revise_plan.buss_sort,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
@@ -342,6 +346,9 @@
             <if test="technologic != null and technologic != ''">
                 technologic=#{technologic},
             </if>
+            <if test="bussSort != null and bussSort != ''">
+                buss_sort=#{bussSort},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -403,6 +410,9 @@
             <if test="technologic != null and technologic != ''">
                 technologic,
             </if>
+            <if test="bussSort != null and bussSort != ''">
+                buss_sort,
+            </if>
         </trim>
         values
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -460,6 +470,9 @@
             <if test="technologic != null and technologic != ''">
                 #{technologic},
             </if>
+            <if test="bussSort != null and bussSort != ''">
+                #{bussSort},
+            </if>
         </trim>
     </insert>
     <!--    删除-->
@@ -494,6 +507,7 @@
         es_revise_plan.is_relate,
         es_revise_plan.use_level,
         es_revise_plan.technologic,
+        es_revise_plan.buss_sort,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,