修复服务团队修改接口

src/main/java/com/mmc/pms/dao/inspection/CompanyInspectionDao.java

@@ -32,4 +32,6 @@ public interface CompanyInspectionDao {
     int countListAPPCompanyInspectionPage(CompanyInspectionQO companyInspectionQO);
 
     List<CompanyInspectionDO> listAPPCompanyInspectionPage(CompanyInspectionQO companyInspectionQO);
+
+    void batchDeleteFile(List<Integer> list);
 }

src/main/java/com/mmc/pms/service/inspection/impl/CompanyInspectionServiceImpl.java

@@ -10,6 +10,7 @@ import com.mmc.pms.enums.InspectionPriceUnitEnums;
 import com.mmc.pms.feign.UserAppApi;
 import com.mmc.pms.model.inspection.dto.CompanyInspectionDTO;
 import com.mmc.pms.model.inspection.dto.IndustryTypeDTO;
+import com.mmc.pms.model.inspection.vo.CompanyInspectionFileVO;
 import com.mmc.pms.model.inspection.vo.CompanyInspectionVO;
 import com.mmc.pms.model.qo.CompanyInspectionQO;
 import com.mmc.pms.page.PageResult;
@@ -23,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author: zj
@@ -52,7 +54,24 @@ public class CompanyInspectionServiceImpl implements CompanyInspectionService {
     public ResultBody update(CompanyInspectionVO companyInspectionVO) {
         CompanyInspectionDO companyInspectionDO = new CompanyInspectionDO(companyInspectionVO);
         companyInspectionDao.update(companyInspectionDO);
+        CompanyInspectionDO companyInspectionDO1 = companyInspectionDao.getCompanyInspectionById(companyInspectionVO.getId());
         // 修改插入图片、视频
+        if (CollectionUtils.isNotEmpty(companyInspectionVO.getCompanyInspectionFiles())) {
+            // 要新增的
+            List<CompanyInspectionFileVO> collect = companyInspectionVO.getCompanyInspectionFiles().stream().filter(item -> item.getId() == null).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(collect)) {
+                collect.stream().forEach(i -> i.setCompanyInspectionId(companyInspectionVO.getId()));
+                companyInspectionDao.batchInsertCompanyInspectionFile(collect);
+            }
+            // 要删除的
+            List<Integer> retainIds = companyInspectionVO.getCompanyInspectionFiles().stream().filter(item -> item.getId() != null).map(item -> item.getId()).collect(Collectors.toList());
+            List<Integer> originIds = companyInspectionDO1.getInspectionFileDOS().stream().map(item -> item.getId()).collect(Collectors.toList());
+            // 移除保留的
+            originIds.removeAll(retainIds);
+            if (CollectionUtils.isNotEmpty(retainIds)){
+                companyInspectionDao.batchDeleteFile(retainIds);
+            }
+        }
         return ResultBody.success();
     }
 

src/main/resources/mapper/inspection/CompanyInspectionDao.xml

@@ -36,6 +36,13 @@
         </collection>
     </resultMap>
 
+    <delete id="batchDeleteFile">
+        delete from company_inspection_file where id in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
     <select id="listFileByCompanyInspectionId" resultType="com.mmc.pms.entity.inspection.CompanyInspectionFileDO">
         select cif.id, file_type, `first`, company_inspection_id, file_url, create_time
          from company_inspection_file cif
@@ -59,34 +66,34 @@
     <update id="update" parameterType="com.mmc.pms.entity.inspection.CompanyInspectionDO">
         update company_inspection
         <set>
-            <if test="companyInfoId">
+            <if test="companyInfoId != null">
                 company_info_id = #{companyInfoId},
             </if>
-            <if test="serviceArea">
+            <if test="serviceArea != null">
                 service_area = #{serviceArea},
             </if>
-            <if test="inspectionId">
+            <if test="inspectionId != null">
                 inspection_id = #{inspectionId},
             </if>
-            <if test="inspectionTagId">
+            <if test="inspectionTagId != null">
                 inspection_tag_id = #{inspectionTagId},
             </if>
-            <if test="price">
+            <if test="price != null">
                 price = #{price},
             </if>
-            <if test="priceRemark">
+            <if test="priceRemark != null">
                 price_remark = #{priceRemark},
             </if>
-            <if test="inspectionPriceUnitId">
+            <if test="inspectionPriceUnitId != null">
                 inspection_price_unit_id = #{inspectionPriceUnitId},
             </if>
-            <if test="detailPage">
+            <if test="detailPage != null">
                 detail_page = #{detailPage},
             </if>
-            <if test="saleState">
+            <if test="saleState != null">
                 sale_state = #{saleState},
             </if>
-            <if test="remark">
+            <if test="remark != null">
                 remark = #{remark}
             </if>
         </set>