Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java

      * 案件申请id
      */
     private Long caseAppliId;
+    /**
+     * 案件记录id
+     */
+    private Long caseAppliLogId;
     /**
      * 附件名称
      */

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAffiliateMapper.java

      * @param affiliateLogList
      */
     void updateCaseAffiliateByCaseId(@Param("caseAppliId")Long caseAppliId,@Param("list") List<CaseAffiliate> affiliateLogList);
+
+    /**
+     * 根据案件id删除
+     * @param caseId
+     */
+    void deleteByCaseId(@Param("caseAppliId") Long caseId);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachLogMapper.java

+package com.ruoyi.wisdomarbitrate.mapper;
+
+import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface CaseAttachLogMapper {
+    int save(CaseAttach caseAttach);
+
+    List<CaseAttach>  queryAnnexPathByCaseId(Long id);
+
+    List<CaseAttach> queryCaseAttachList(CaseApplication caseApplication);
+
+
+    int updateCaseAttach(CaseAttach caseAttach);
+
+    int updateCaseAttachBycaseid(CaseAttach caseAttach);
+
+    int deleteByFileIds(@Param("ids") List<Integer> fileIds);
+
+    List<CaseAttach> getCaseAttachByCaseIdAndType(CaseAttach caseAttach);
+
+    CaseAttach queryAnnexById(Integer annexId);
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java

     List<CaseAttach> getCaseAttachByCaseIdAndType(CaseAttach caseAttach);
 
     CaseAttach queryAnnexById(Integer annexId);
+
+    /**
+     * 根据案件id和附件类型删除
+     * @param caseAppliId
+     * @param annexType
+     */
+    void deleteByCasedIdAndType(@Param("caseAppliId")Long caseAppliId,@Param("annexType") int annexType);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationLogServiceImpl.java

 import com.ruoyi.common.utils.SmsUtils;
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
 import com.ruoyi.wisdomarbitrate.domain.SmsSendRecord;
 import com.ruoyi.wisdomarbitrate.domain.vo.CompareCaseVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.UpdateSubmitVO;
     @Autowired
     private CaseAffiliateMapper caseAffiliateMapper;
     @Autowired
+    private CaseAttachMapper caseAttachMapper;
+    @Autowired
+    private CaseAttachLogMapper caseAttachLogMapper;
+    @Autowired
     private SmsRecordMapper smsRecordMapper;
     @Override
     public int insert(CaseApplication caseApplicationLog) {
 
                 // 更新相关人员主表
                 if(CollectionUtil.isNotEmpty(affiliateLogList)){
+                    caseAffiliateMapper.deleteByCaseId(vo.getCaseId());
                     for (CaseAffiliate caseAffiliate : affiliateLogList) {
-                       caseAffiliateMapper.updataCaseAffiliate(caseAffiliate);
+                        caseAffiliate.setCaseAppliId(vo.getCaseId());
+
+                    }
+                    caseAffiliateMapper.batchCaseAffiliate(affiliateLogList);
+                }
+                // // 根据caseLogId查询案件记录附件表
+                CaseApplication caseApplication = new CaseApplication();
+                caseApplication.setCaseLogId(caseApplicationLog.getCaseLogId());
+                caseApplication.setAnnexType(2);
+                List<CaseAttach> attachLogList = caseAttachLogMapper.queryCaseAttachList(caseApplication);
+                // 更新记录附件表
+                if(CollectionUtil.isNotEmpty(attachLogList)){
+                    caseAttachMapper.deleteByCasedIdAndType(vo.getCaseId(), 2);
+                    for (CaseAttach caseAttach : attachLogList) {
+                        caseAttach.setCaseAppliId(vo.getCaseId());
+                        caseAttachMapper.save(caseAttach);
                     }
                 }
              //   caseAffiliateMapper.updateCaseAffiliateByCaseId(caseApplicationLog.getCaseAppliId(), affiliateLogList);
         // 根据caseLogId查询相关人员表
         List<CaseAffiliate> affiliateLogList = caseAffiliateLogMapper.selectCaseAffiliate(caseApplicationLog.getCaseLogId());
 
+
         // 更新案件主表
         caseApplicationMapper.updataCaseApplication(caseApplicationLog);
 
         // 更新相关人员主表
         if(CollectionUtil.isNotEmpty(affiliateLogList)){
+            caseAffiliateMapper.deleteByCaseId(vo.getCaseId());
             for (CaseAffiliate caseAffiliate : affiliateLogList) {
-                caseAffiliateMapper.updataCaseAffiliate(caseAffiliate);
+                caseAffiliate.setCaseAppliId(vo.getCaseId());
+
+            }
+            caseAffiliateMapper.batchCaseAffiliate(affiliateLogList);
+        }
+        // // 根据caseLogId查询案件记录附件表
+        CaseApplication caseApplication = new CaseApplication();
+        caseApplication.setCaseLogId(caseApplicationLog.getCaseLogId());
+        caseApplication.setAnnexType(2);
+        List<CaseAttach> attachLogList = caseAttachLogMapper.queryCaseAttachList(caseApplication);
+        // 更新记录附件表
+        if(CollectionUtil.isNotEmpty(attachLogList)){
+            caseAttachMapper.deleteByCasedIdAndType(vo.getCaseId(), 2);
+            for (CaseAttach caseAttach : attachLogList) {
+                caseAttach.setCaseAppliId(vo.getCaseId());
+                caseAttachMapper.save(caseAttach);
             }
         }
        // caseAffiliateMapper.updateCaseAffiliateByCaseId(caseApplicationLog.getCaseAppliId(), affiliateLogList);

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

     private CaseApplicationLogMapper caseApplicationLogMapper;
     @Autowired
     private CaseAffiliateLogMapper caseAffiliateLogMapper;
+    @Autowired
+    private CaseAttachLogMapper caseAttachLogMapper;
 
     // 手机号正则
     private static final Pattern TELEPHONE_REGX = Pattern.compile("^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
 
         }
         List<CaseAttach> caseAttachList = caseApplication.getCaseAttachList();
-        if (caseAttachList != null && caseAttachList.size() > 0) {
+        // 立案申请状态直接修改主表信息
+            if (caseAttachList != null && caseAttachList.size() > 0
+                    && caseApplication.getCaseStatus()!=null && caseApplication.getCaseStatus().equals(CaseApplicationConstants.CASE_APPLICATION)) {
             for (CaseAttach caseAttach : caseAttachList) {
                 caseAttach.setCaseAppliId(caseApplication.getId());
                 caseAttachMapper.updateCaseAttach(caseAttach);
         ThreadPoolUtil.execute(() -> {
             caseApplication.setCaseAppliId(caseApplication.getId());
             int insertRow = caseApplicationLogMapper.insert(caseApplication);
-            if (insertRow != 0 && CollectionUtil.isNotEmpty(caseAffiliates)) {
-                caseAffiliates.forEach(caseAffiliate -> caseAffiliate.setCaseAppliLogId(caseApplication.getId()));
-                // 插入案件日志人员相关表
-                caseAffiliateLogMapper.batchCaseAffiliate(caseAffiliates);
+            if (insertRow != 0 ) {
+                if( CollectionUtil.isNotEmpty(caseAffiliates)) {
+                    caseAffiliates.forEach(caseAffiliate -> caseAffiliate.setCaseAppliLogId(caseApplication.getId()));
+                    // 插入案件日志人员相关表
+                    caseAffiliateLogMapper.batchCaseAffiliate(caseAffiliates);
+                }
+                if(CollectionUtil.isNotEmpty(caseAttachList)) {
+                    // 插入日志附件表
+                    for (CaseAttach caseAttach : caseAttachList) {
+                        caseAttach.setCaseAppliLogId(caseApplication.getId());
+                        caseAttachLogMapper.updateCaseAttach(caseAttach);
+                    }
+
+                }
             }
         });
 

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml

             #{item}
         </foreach>
     </delete>
+    <delete id="deleteByCaseId">
+        delete from case_affiliate where case_appli_id = #{caseAppliId}
+    </delete>
 
 
 </mapper>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachLogMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.CaseAttachLogMapper">
+    <resultMap type="CaseAttach" id="CaseAttachResult">
+        <id     property="annexId"       column="annex_id"      />
+        <result property="caseAppliId"       column="case_appli_id"      />
+        <result property="annexName"     column="annex_name"    />
+        <result property="annexPath"     column="annex_path"    />
+        <result property="annexType"     column="annex_type"    />
+        <result property="note"     column="note"    />
+        <result property="userId"     column="use_id"    />
+        <result property="userName"     column="use_account"    />
+        <result property="sealStatus"     column="seal_status"    />
+        <result property="caseAppliLogId"     column="case_appli_log_id"    />
+    </resultMap>
+    <insert id="save" useGeneratedKeys="true" keyProperty="annexId">
+        INSERT INTO case_attach_log (case_appli_log_id, annex_name, annex_path , annex_type,note,use_id,use_account,seal_status)
+        VALUES (#{caseAppliLogId}, #{annexName}, #{annexPath},#{annexType},#{note},#{userId},#{userName},#{sealStatus})
+    </insert>
+    <delete id="deleteByFileIds">
+        delete from case_attach_log
+        where annex_id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="queryAnnexPathByCaseId" resultType="com.ruoyi.wisdomarbitrate.domain.CaseAttach" resultMap="CaseAttachResult">
+        select annex_id,case_appli_log_id,annex_name,annex_path,annex_type,note,use_id,use_account
+        from case_attach_log
+        where case_appli_log_id =#{id}
+    </select>
+
+    <select id="getCaseAttachByCaseIdAndType" resultType="com.ruoyi.wisdomarbitrate.domain.CaseAttach" resultMap="CaseAttachResult">
+        select annex_id,case_appli_log_id,annex_name,annex_path,annex_type,note,use_id,use_account
+        from case_attach_log
+        <where>
+            <if test="caseAppliLogId != null ">
+                AND case_appli_log_id = #{caseAppliLogId}
+            </if>
+            <if test="annexType != null ">
+                AND annex_type = #{annexType}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryCaseAttachList" resultMap="CaseAttachResult">
+        select annex_id,case_appli_log_id,annex_name,annex_path,annex_type,note,use_id,use_account
+        from case_attach_log
+        <where>
+            <if test="caseLogId != null ">
+                AND case_appli_log_id = #{caseLogId}
+            </if>
+            <if test="annexType != null ">
+                AND annex_type = #{annexType}
+            </if>
+            <if test="annexTypeList != null and annexTypeList.size() > 0">
+                and annex_type in
+                <foreach item="annexType" collection="annexTypeList" open="(" separator="," close=")">
+                    #{annexType}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="queryAnnexById" resultType="com.ruoyi.wisdomarbitrate.domain.CaseAttach" resultMap="CaseAttachResult">
+        select case_appli_log_id caseAppliLogId,annex_id,annex_name,annex_path,annex_type,note,use_id,use_account
+        from case_attach_log
+        <where>
+            <if test="annexId != null ">
+                AND annex_id = #{annexId}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateCaseAttach" parameterType="CaseAttach">
+        update case_attach_log
+        set
+            case_appli_log_id= #{caseAppliLogId}
+        where annex_id = #{annexId}
+    </update>
+
+    <update id="updateCaseAttachBycaseid" parameterType="CaseAttach" >
+        update case_attach_log
+        <set>
+            <if test="annexName != null and annexName != ''">annex_name = #{annexName},</if>
+            <if test="annexPath != null and annexPath != ''">annex_path = #{annexPath}</if>
+        </set>
+        <where>
+            <if test="caseAppliId != null ">
+                AND case_appli_log_id  = #{caseAppliLogId}
+            </if>
+            <if test="annexType != null ">
+                AND annex_type  = #{annexType}
+            </if>
+        </where>
+    </update>
+
+
+</mapper>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAttachMapper.xml

             #{id}
         </foreach>
     </delete>
+    <delete id="deleteByCasedIdAndType">
+        delete from case_attach
+        where case_appli_id = #{caseAppliId}
+        and annex_type = #{annexType}
+    </delete>
 
     <select id="queryAnnexPathByCaseId" resultType="com.ruoyi.wisdomarbitrate.domain.CaseAttach" resultMap="CaseAttachResult">
         select annex_id,case_appli_id,annex_name,annex_path,annex_type,note,use_id,use_account