diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java index ef6705b8..3fd66ba2 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/MessageDetailResponse.java @@ -2,12 +2,14 @@ package com.daqing.financial.guarantee.model.response; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.daqing.framework.domain.guarantee.DgMessageInvestigation; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import java.io.Serializable; import java.util.LinkedHashMap; +import java.util.List; @Data @ToString @@ -38,4 +40,7 @@ public class MessageDetailResponse implements Serializable { @ApiModelProperty(value = "附件详细") private DgEnclosureInfoResponse dgEnclosureInfo; + @ApiModelProperty(value = "信息部调查附件详细") + private List messageFileList; + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index b836439d..5e103e93 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -309,6 +309,24 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl() + .eq("business_id", businessApplication.getBusinessId()).eq("type", 1)); + //将业务员状态改为审核中,操作状态改为已处理 + dgApplyAmountList.setId(dgApplyAmountList.getId()); + dgApplyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审核中 + dgApplyAmountList.setOperatingStatus(StatusCode.CZ_PROCESSED);//已处理 + dgApplyAmountListMapper.updateById(dgApplyAmountList); + //同时将担保部经理状态改为审核中,操作状态改为待处理 + DgApplyAmountList applyAmountList = dgApplyAmountListMapper.selectOne(new QueryWrapper() + .eq("business_id", businessApplication.getBusinessId()).eq("type", 2)); + applyAmountList.setId(dgApplyAmountList.getId()); + applyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审核中 + applyAmountList.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理 + dgApplyAmountListMapper.updateById(applyAmountList); + //结束--------------------------------------------- + //业务申请重新绑定关联人 //修改是否存在关联人 crmsFeignService.updateIsExistRelated(businessApplication.getCompanyId(),businessApplication.getIsExistRelated()); @@ -452,6 +470,15 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl() + .eq("business_id",dgApplyAmountList1.getBusinessId()).eq("type",1)); + } + //如果审批状态为已审核,并且操作状态为已处理,则同时新增数据到担保部,资产部和信息部,让这三个模块去审 if(dgApplyAmountList.getStatus().equals(StatusCode.SP_REVIEWED) && dgApplyAmountList.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java index 8980c20e..b26e5e4e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java @@ -71,6 +71,8 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl roleIdlist, String userId, Integer status) { @@ -257,6 +259,39 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl() + .eq("business_id",processStatus.getBusinessId())); + } + + //驳回情况 + if(approvalAssetsRequest.getStatus().equals(StatusCode.SP_REJECT)){ + //修改资产部调查下该业务的所有审批状态为驳回 + DgAssetsInvestigation assets = new DgAssetsInvestigation(); + assets.setStatus(StatusCode.SP_REJECT);//驳回 + this.baseMapper.update(assets,new QueryWrapper() + .eq("business_id",assetsInvestigation.getBusinessId())); + } + + DgAssetsInvestigation dgAssets = new DgAssetsInvestigation(); + dgAssets.setStatus(StatusCode.SP_REJECT);//驳回 + dgAssets.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理 + //资产部经理驳回情况 + if(approvalAssetsRequest.getStatus().equals(StatusCode.SP_REJECT) && assetsInvestigation.getType()==2){ + //资产部专员调查审批状态为驳回,操作状态为待处理 + this.baseMapper.update(dgAssets,new QueryWrapper() + .eq("business_id",assetsInvestigation.getBusinessId()).eq("type",1)); + } + //资产部领导驳回情况 + if(approvalAssetsRequest.getStatus().equals(StatusCode.SP_REJECT) && assetsInvestigation.getType()==3){ + //资产部经理审批状态设置为驳回,操作状态设置为待处理 + this.baseMapper.update(dgAssets,new QueryWrapper() + .eq("business_id",assetsInvestigation.getBusinessId()).eq("type",2)); + } + //如果资产部经理审核通过,则往担保部分管领导处加一条记录,由分管领导审核 if(approvalAssetsRequest.getStatus()==StatusCode.SP_IN_REVIEW && assetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==2){//资产部经理审核通过 //根据主键id查询业务id diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java index 84a3e1e5..6d23d738 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java @@ -63,6 +63,11 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl roleIdlist, String userId, Integer status) { @@ -174,6 +179,44 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl().eq("business_id",guaranteeAssignUser.getBusinessId()) + .eq("type",1).eq("status",StatusCode.SP_IN_REVIEW).eq("operating_status",StatusCode.CZ_PROCESSED)); + int n = this.baseMapper.selectCount(new QueryWrapper().eq("business_id",guaranteeAssignUser.getBusinessId()) + .eq("type",2).eq("status",StatusCode.SP_IN_REVIEW).eq("operating_status",StatusCode.CZ_PROCESSED)); + int sum = i+n; + + //如果是属于驳回的数据,并且调查通过 + if(guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT)){ + //判断AB角是否都调查通过,如果通过,则将担保部经理的状态改为待处理,同时所有的审批状态都变成审核中 + if(sum == 2){ + DgGuaranteeAssignUser user = new DgGuaranteeAssignUser(); + user.setStatus(StatusCode.SP_IN_REVIEW);//审核中 + this.baseMapper.update(user,new QueryWrapper() + .eq("business_id",guaranteeAssignUser.getBusinessId())); + } + } + + if(investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_REJECT)){//驳回情况处理 + //业务申请部分业务专员审批状态设置为驳回,操作状态设置为待处理 + DgApplyAmountList dgApplyAmountList= new DgApplyAmountList(); + dgApplyAmountList.setStatus(StatusCode.SP_REJECT);//状态设置为驳回 + dgApplyAmountList.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理 + dgApplyAmountListMapper.update(dgApplyAmountList,new QueryWrapper() + .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("type",1)); + //业务申请部分担保部经理审批状态设置为驳回,操作状态设置为已处理 + DgApplyAmountList applyAmountList= new DgApplyAmountList(); + applyAmountList.setStatus(StatusCode.SP_REJECT);//状态设置为驳回 + applyAmountList.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理 + dgApplyAmountListMapper.update(applyAmountList,new QueryWrapper() + .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("type",2)); + + //修改担保部调查下该业务的所有审批状态为驳回 + DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser(); + assignUser.setStatus(StatusCode.SP_REJECT);//驳回 + this.baseMapper.update(assignUser,new QueryWrapper() + .eq("business_id",guaranteeAssignUser.getBusinessId())); + } + //上传附件信息 DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo(); dgEnclosureInfo.setBusinessId(guaranteeAssignUser.getBusinessId());//业务id @@ -194,11 +237,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl().eq("business_id",guaranteeAssignUser.getBusinessId()) - .eq("type",1).eq("status",StatusCode.SP_IN_REVIEW).eq("operating_status",StatusCode.CZ_PROCESSED)); - int n = this.baseMapper.selectCount(new QueryWrapper().eq("business_id",guaranteeAssignUser.getBusinessId()) - .eq("type",2).eq("status",StatusCode.SP_IN_REVIEW).eq("operating_status",StatusCode.CZ_PROCESSED)); - int sum = i+n; + if(sum==2){ DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser(); assignUser.setRoleId(PromptSuccess.DB_JL_ID);//担保部经理 @@ -235,6 +274,40 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl() + .eq("business_id",processStatus.getBusinessId())); + } + + //驳回情况 + if(approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REJECT)){ + //修改担保部调查下该业务的所有审批状态为驳回 + DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser(); + assignUser.setStatus(StatusCode.SP_REJECT);//驳回 + this.baseMapper.update(assignUser,new QueryWrapper() + .eq("business_id",guaranteeUser.getBusinessId())); + } + + DgGuaranteeAssignUser dgAssignUser = new DgGuaranteeAssignUser(); + dgAssignUser.setStatus(StatusCode.SP_REJECT);//驳回 + dgAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理 + //担保部经理驳回情况 + if(approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REJECT) && guaranteeUser.getType()==3){ + //A,B角调查部分审批状态统一设置驳回,操作状态设置为待处理 + this.baseMapper.update(dgAssignUser,new QueryWrapper() + .eq("business_id",guaranteeUser.getBusinessId()).eq("type",1)); + this.baseMapper.update(dgAssignUser,new QueryWrapper() + .eq("business_id",guaranteeUser.getBusinessId()).eq("type",2)); + } + //担保部领导驳回情况 + if(approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REJECT) && guaranteeUser.getType()==4){ + //担保部经理审批状态设置为驳回,操作状态设置为待处理 + this.baseMapper.update(dgAssignUser,new QueryWrapper() + .eq("business_id",guaranteeUser.getBusinessId()).eq("type",3)); + } //如果担保部经理审核通过,则往担保部分管领导处加一条记录,由分管领导审核 if(approvalGuaranteeRequest.getStatus()==StatusCode.SP_IN_REVIEW && guaranteeUser.getOperatingStatus()==StatusCode.CZ_PROCESSED && guaranteeUser.getType()==3){//担保部经理审核通过 //根据主键id查询业务id diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java index 7347f9f9..218eaf8a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java @@ -68,6 +68,8 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl roleIdlist, String userId, Integer status) { @@ -124,23 +126,34 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl0){ - String a = measures.substring(1,measures.length()-1); + if(measures != null){ + if(measures.length()>0){ + String a = measures.substring(1,measures.length()-1); + String arry[]=a.split(","); + List demoList = Arrays.asList(arry); + dgApplyAmountInfo.setEnGuaranteeMeasure(demoList); + } + } + + MessageDetailResponse messageDetailResponse= new MessageDetailResponse(); + //查询信息部调查专员调查的附件信息 + DgMessageInvestigation messageInvestigation = this.baseMapper.selectOne(new QueryWrapper() + .eq("business_id", dgMessageInvestigation.getBusinessId()) + .eq("type", 1)); + String files=messageInvestigation.getFile(); + if(files!=null){ + String a = files.substring(1,files.length()-1); String arry[]=a.split(","); List demoList = Arrays.asList(arry); - dgApplyAmountInfo.setEnGuaranteeMeasure(demoList); - System.out.println("arry==============="+demoList); + messageDetailResponse.setMessageFileList(demoList); } - System.out.println("业务申请详细========="+dgApplyAmountInfo); - DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest(); applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId()); //根据企业id查询企业详情 ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo); LinkedHashMap linkedList = (LinkedHashMap)result.getData(); - System.out.println("企业详细============"+linkedList); //查询附件详细,附件关联业务主键id DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(dgMessageInvestigation.getBusinessId()); @@ -170,7 +183,6 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl) arr1List2.get(12)); dgEnclosureInfo.setMarriageCopyList((List) arr1List2.get(13)); - System.out.println("附件详细=============="+dgEnclosureInfo); - MessageDetailResponse messageDetailResponse= new MessageDetailResponse(); + messageDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo); messageDetailResponse.setDgEnclosureInfo(dgEnclosureInfo); messageDetailResponse.setLinkedHashMap(linkedList); @@ -245,6 +256,39 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl() + .eq("business_id",processStatus.getBusinessId())); + } + + //驳回情况 + if(approvalMessageRequest.getStatus().equals(StatusCode.SP_REJECT)){ + //修改信息部调查下该业务的所有审批状态为驳回 + DgMessageInvestigation message = new DgMessageInvestigation(); + message.setStatus(StatusCode.SP_REJECT);//驳回 + this.baseMapper.update(message,new QueryWrapper() + .eq("business_id",messageInvestigation.getBusinessId())); + } + + DgMessageInvestigation dgMessage = new DgMessageInvestigation(); + dgMessage.setStatus(StatusCode.SP_REJECT);//驳回 + dgMessage.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理 + //信息部经理驳回情况 + if(approvalMessageRequest.getStatus().equals(StatusCode.SP_REJECT) && messageInvestigation.getType()==2){ + //信息部专员审批状态设置为驳回,操作状态为待处理 + this.baseMapper.update(dgMessage,new QueryWrapper() + .eq("business_id",messageInvestigation.getBusinessId()).eq("type",1)); + } + //信息部领导驳回情况 + if(approvalMessageRequest.getStatus().equals(StatusCode.SP_REJECT) && messageInvestigation.getType()==3){ + //信息部经理审批状态设置为驳回,操作状态为待处理 + this.baseMapper.update(dgMessage,new QueryWrapper() + .eq("business_id",messageInvestigation.getBusinessId()).eq("type",2)); + } + //如果信息部经理审核通过,则往信息部分管领导处加一条记录,由分管领导审核 if(approvalMessageRequest.getStatus()==StatusCode.SP_IN_REVIEW && messageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过 //根据主键id查询业务id