Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!334

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/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -49,6 +49,8 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     int deleteByStandIdAndFileType(@Param("standId") String standId, @Param("fileType") String fileType);
 
+    int deleteByStandIdAndFileTypes(@Param("standId") String standId, @Param("fileType") String fileType,@Param("items")List<String> strings);
+
     Set<String> selectClaimTypesByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList);
 
     Set<String> selectSvppsByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -169,7 +169,11 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     @Override
     public String sarStandItemsaveBatch(List<SarStandItems> sarStandItems) {
         if (null!=sarStandItems && sarStandItems.size()>0) {
-            sarStandItemsDao.deleteByStandIdAndFileType(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType());
+            List<String> strings=new ArrayList<>();
+            sarStandItems.forEach(sarStandItems1 -> {
+                strings.add(sarStandItems1.getItemsNum());
+            });
+            sarStandItemsDao.deleteByStandIdAndFileTypes(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType(),strings);
         }
         boolean flag=this.saveBatch(sarStandItems);
         if (flag){

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -655,6 +655,20 @@
         </if>
     </delete>
 
+    <delete id="deleteByStandIdAndFileTypes" parameterType="java.lang.String">
+        delete from SAR_STAND_ITEMS
+        where stand_id = #{standId}
+        <if test="fileType != null">
+            and file_type = #{fileType}
+        </if>
+        <if test="items != null ">
+            and items_num in
+            <foreach item="itemNum" collection="items" open="(" separator="," close=")" index="index">
+                #{itemNum}
+            </foreach>
+        </if>
+    </delete>
+
     <delete id="deleteByIds" parameterType="java.lang.String">
         delete from SAR_STAND_ITEMS
         where id in

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

@@ -51,6 +51,7 @@
         <result property="isRelate" column="is_relate"/>
         <result property="useLevel" column="use_level"/>
         <result property="technologic" column="technologic"/>
+        <result property="bussSort" column="bussSort"/>
     </resultMap>
 
     <resultMap id="BaseInfoMapList" type="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan">
@@ -73,7 +74,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 +139,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 +207,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 +275,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 +347,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 +411,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 +471,9 @@
             <if test="technologic != null and technologic != ''">
                 #{technologic},
             </if>
+            <if test="bussSort != null and bussSort != ''">
+                #{bussSort},
+            </if>
         </trim>
     </insert>
     <!--    删除-->
@@ -494,6 +508,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,