Merge remote-tracking branch 'origin/master'

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

@@ -350,6 +350,11 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
             this.baseMapper.update(assets2,new QueryWrapper<DgAssetsInvestigation>()
                     .eq("business_id",assetsInvestigation.getBusinessId()).eq("type",3));
         }else if(approvalAssetsRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，业务状态则为已否决
+            DgAssetsInvestigation user = new DgAssetsInvestigation();
+            user.setStatus(StatusCode.SP_REFUSE);//审批状态为拒绝
+            this.baseMapper.update(user, new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id", assetsInvestigation.getBusinessId()));
+
             DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
             processStatus.setBusinessId(assetsInvestigation.getBusinessId());
             processStatus.setBusinessStatus(StatusCode.YW_REJECTED);//业务状态设置为已否决

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

@@ -240,10 +240,31 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 dgGuaranteeAssignUser.setStatus(investigateGuaranteeRequest.getStatus());//状态为审核中
                 dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
                 this.baseMapper.updateById(dgGuaranteeAssignUser);
-            }else{//保存
+            }else if(investigateGuaranteeRequest.getIsSaveOrCommit() != null && investigateGuaranteeRequest.getIsSaveOrCommit()!=1){//保存
                 dgGuaranteeAssignUser.setStatus(guaranteeAssignUser.getStatus());//审批状态 当前是什么状态就是什么状态
                 dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
                 this.baseMapper.updateById(dgGuaranteeAssignUser);
+            }else{
+                if(investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，则修改所有审批状态为拒绝，同时A,B角操作状态均为已处理
+                    dgGuaranteeAssignUser.setStatus(StatusCode.SP_REFUSE);//拒绝
+                    this.baseMapper.update(dgGuaranteeAssignUser,new QueryWrapper<DgGuaranteeAssignUser>()
+                            .eq("business_id",guaranteeAssignUser.getBusinessId()));
+                    dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//已处理
+                    this.baseMapper.update(dgGuaranteeAssignUser,new QueryWrapper<DgGuaranteeAssignUser>()
+                            .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("type",1));
+                    this.baseMapper.update(dgGuaranteeAssignUser,new QueryWrapper<DgGuaranteeAssignUser>()
+                            .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("type",2));
+
+                    //拒绝状态下，修改业务状态为已否决
+                    DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
+                    processStatus.setBusinessStatus(3);//已否决
+                    dgBusinessProcessStatusMapper.update(processStatus,new QueryWrapper<DgBusinessProcessStatus>()
+                            .eq("business_id",guaranteeAssignUser.getBusinessId()));
+                }else{
+                    dgGuaranteeAssignUser.setStatus(investigateGuaranteeRequest.getStatus());//审批状态 请求过来是什么状态就是什么
+                    dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
+                    this.baseMapper.updateById(dgGuaranteeAssignUser);
+                }
             }
         }
 
@@ -429,7 +450,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             user.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态为待处理
             this.baseMapper.update(user, new QueryWrapper<DgGuaranteeAssignUser>()
                     .eq("business_id", guaranteeUser.getBusinessId()).eq("type", 4));
-        } else if (approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REFUSE)) {//如果为拒绝，业务状态则为已否决
+        } else if (approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REFUSE)) {//如果为拒绝，业务状态则为已否决，设置子业务下所有审批状态为拒绝
+            DgGuaranteeAssignUser user = new DgGuaranteeAssignUser();
+            user.setStatus(StatusCode.SP_REFUSE);//审批状态为拒绝
+            this.baseMapper.update(user, new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeUser.getBusinessId()));
+
             DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
             processStatus.setBusinessId(guaranteeUser.getBusinessId());
             processStatus.setBusinessStatus(StatusCode.YW_REJECTED);//业务状态设置为已否决

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

@@ -323,6 +323,11 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
             this.baseMapper.update(message2,new QueryWrapper<DgMessageInvestigation>()
                     .eq("business_id",messageInvestigation.getBusinessId()).eq("type",3 ));
         }else if(approvalMessageRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，业务状态则为已否决
+            DgMessageInvestigation user = new DgMessageInvestigation();
+            user.setStatus(StatusCode.SP_REFUSE);//审批状态为拒绝
+            this.baseMapper.update(user, new QueryWrapper<DgMessageInvestigation>()
+                    .eq("business_id", messageInvestigation.getBusinessId()));
+
             DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
             processStatus.setBusinessId(messageInvestigation.getBusinessId());
             processStatus.setBusinessStatus(StatusCode.YW_REJECTED);//业务状态设置为已否决

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml

@@ -33,7 +33,7 @@
                 #{id}
             </foreach>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND ai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
+                AND (ai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%'))
             </if>
             <if test="status != null">
                 AND au.status = #{status}