更改反担保人逻辑

ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -398,7 +398,7 @@ public class AsyncFactory {
                                 createPdfFromImagesGuaranteeInfoFj(list,guaranteeInfoFjInsert, imagePaths, loanApplicationNumber, fjName + "_" + Seq.getId(Seq.uploadSeqType), type, loanApplicationId, guaranteeInfoId);
                             }
                         }
-                        //判断是否有股东shareholder_fj_id
+                        //判断是否有反担保GuaranteeInfoFjId
                         List<GuaranteeInfoFj> guaranteeInfoFjListInsert = guaranteeInfoFjList.stream().filter(e -> ObjectUtils.isEmpty(e.getGuaranteeInfoFjId())).collect(Collectors.toList());
                         if (guaranteeInfoFjListInsert.size() > 0) {
                             // 新增反担保附件数据

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -370,7 +370,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             List<GuaranteeInfo> guaranteeInfosInsert = guaranteeInfoList.stream().filter(e -> ObjectUtils.isEmpty(e.getGuaranteeInfoId())).collect(Collectors.toList());
             List<GuaranteeInfo> guaranteeInfosUpdate = guaranteeInfoList.stream().filter(e -> ObjectUtils.isNotEmpty(e.getGuaranteeInfoId())).collect(Collectors.toList());
             if (guaranteeInfosInsert.size() > 0){
-                guaranteeInfoMapper.batchGuaranteeInfo(guaranteeInfoList);
+                guaranteeInfoMapper.batchGuaranteeInfo(guaranteeInfosInsert);
             }
             if (guaranteeInfosUpdate.size() > 0) {
                 for (GuaranteeInfo guaranteeInfo : guaranteeInfosUpdate) {
@@ -382,6 +382,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             }
             if (guaranteeInfoIdList.length > 0){
                 guaranteeInfoMapper.deleteGuaranteeInfoByGuaranteeInfoIds(guaranteeInfoIdList);
+                guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoFjIdList);
             }
             //先新增反担保基础信息,再去异步插入附件
             //异步插入附件
@@ -455,7 +456,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 List<GuaranteeInfo> guaranteeInfosInsert = guaranteeInfoList.stream().filter(e -> ObjectUtils.isEmpty(e.getGuaranteeInfoId())).collect(Collectors.toList());
                 List<GuaranteeInfo> guaranteeInfosUpdate = guaranteeInfoList.stream().filter(e -> ObjectUtils.isNotEmpty(e.getGuaranteeInfoId())).collect(Collectors.toList());
                 if (guaranteeInfosInsert.size() > 0){
-                    guaranteeInfoMapper.batchGuaranteeInfo(guaranteeInfoList);
+                    guaranteeInfoMapper.batchGuaranteeInfo(guaranteeInfosInsert);
                 }
                 if (guaranteeInfosUpdate.size() > 0) {
                     for (GuaranteeInfo guaranteeInfo : guaranteeInfosUpdate) {
@@ -467,6 +468,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 }
                 if (guaranteeInfoIdList.length > 0){
                     guaranteeInfoMapper.deleteGuaranteeInfoByGuaranteeInfoIds(guaranteeInfoIdList);
+                    guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoFjIdList);
                 }
                 //先新增反担保基础信息,再去异步插入附件
                 //异步插入附件
@@ -523,7 +525,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             List<GuaranteeInfo> guaranteeInfosInsert = guaranteeInfoList.stream().filter(e -> ObjectUtils.isEmpty(e.getGuaranteeInfoId())).collect(Collectors.toList());
             List<GuaranteeInfo> guaranteeInfosUpdate = guaranteeInfoList.stream().filter(e -> ObjectUtils.isNotEmpty(e.getGuaranteeInfoId())).collect(Collectors.toList());
             if (guaranteeInfosInsert.size() > 0){
-                guaranteeInfoMapper.batchGuaranteeInfo(guaranteeInfoList);
+                guaranteeInfoMapper.batchGuaranteeInfo(guaranteeInfosInsert);
             }
             if (guaranteeInfosUpdate.size() > 0) {
                 for (GuaranteeInfo guaranteeInfo : guaranteeInfosUpdate) {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/GuaranteeInfoFjMapper.java

@@ -60,4 +60,5 @@ public interface GuaranteeInfoFjMapper
      * @return 结果
      */
     public int deleteGuaranteeInfoFjByGuaranteeInfoFjIds(Long[] guaranteeInfoFjIds);
+    public int deleteGuaranteeInfoFjByGuaranteeInfoIds(Long[] guaranteeInfoId);
 }

ruoyi-system/src/main/resources/mapper/system/GuaranteeInfoFjMapper.xml

@@ -113,4 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{guaranteeInfoFjId}
         </foreach>
     </delete>
+    <delete id="deleteGuaranteeInfoFjByGuaranteeInfoIds" parameterType="String">
+        delete from guarantee_info_fj where guarantee_info_id in
+
+        <foreach item="guaranteeInfoId" collection="array" open="(" separator="," close=")">
+            #{guaranteeInfoId}
+        </foreach>
+    </delete>
 </mapper>