Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -202,7 +202,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     auditOpinion,9,PromptSuccess.CWB_ID,"","","",status);
             //更新成功，更新资产部经理数据及其他人的数据
             if (update > 0){
-                //更新法规部经理数据
+                //更新担保函法规部经理数据
                 //根据业务id查询法规部经理数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperFg = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapperFg.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
@@ -210,7 +210,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                 dgGuaranteeLetterAssignUserFg.setStatus(StatusCode.SP_REJECT);
                 guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserFg);
 
-                //更新a角
+                //更新担保函a角数据
                 //根据业务id查询A用户数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperA = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapperA.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
@@ -218,7 +218,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                 dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT);
                 guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserA);
 
-                //更新b角
+                //更新担保函b角数据
                 //根据业务id查询B用户数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperB = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapperB.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID);
@@ -226,12 +226,29 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                 dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REJECT);
                 guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserB);
 
+                //更新担保函资产部经理数据
+                //根据业务id查询资产部经理数据
                 QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapper = new QueryWrapper<>();
                 guaranteeLetterAssignUserQueryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.ZC_JL_ID);
                 DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapper);
                 dgGuaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT);
                 dgGuaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);
                 dgGuaranteeLetterAssignUser.setAuditOpinion("");
+
+                //如果财务确认的法规部经理有数据，更新法规部经理数据
+                //法规部数据存在，更新法规部经理财务回款数据
+                QueryWrapper<DgPaymentConfirmationConsider> paymentConfirmationConsiderFG = new QueryWrapper<>();
+                paymentConfirmationConsiderFG.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
+                DgPaymentConfirmationConsider paymentConfirmationConsiderFg = baseMapper.selectOne(paymentConfirmationConsiderFG);
+                //数据存在，进行更新
+                if (ObjectUtil.isNotNull(paymentConfirmationConsiderFg)){
+                    paymentConfirmationConsiderFg.setStatus(StatusCode.SP_REJECT);
+                    //清空上次的审批意见及银行回单
+                    paymentConfirmationConsiderFg.setAuditOpinion("");
+                    paymentConfirmationConsiderFg.setImgFile("");
+                    baseMapper.updateById(paymentConfirmationConsiderFg);
+                }
+
                 int updateById = guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUser);
                 //更新成功，返回操作结果
                 log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");