From 89a2b60a509c79ababcc59f219c69c02c538972d Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 27 Nov 2020 18:07:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=B0=E5=BD=95=E5=88=B0?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=B0=83=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DgAssetsInvestigationServiceImpl.java | 36 ++++++++++++++----- .../DgGuaranteeAssignUserServiceImpl.java | 34 ++++++++++++++---- .../DgMessageInvestigationServiceImpl.java | 31 ++++++++++++++-- .../guarantee/DgComplianceInvestigation.java | 7 +++- 4 files changed, 90 insertions(+), 18 deletions(-) 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 efe6a203..8980c20e 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 @@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.feign.CrmsFeignService; import com.daqing.financial.guarantee.feign.HrmsFeignService; -import com.daqing.financial.guarantee.mapper.DgApplyAmountInfoMapper; -import com.daqing.financial.guarantee.mapper.DgAssetsAssessmentAssetsLogMapper; -import com.daqing.financial.guarantee.mapper.DgAssetsInvestigationMapper; -import com.daqing.financial.guarantee.mapper.DgAssetsMoneyMapper; +import com.daqing.financial.guarantee.mapper.*; import com.daqing.financial.guarantee.model.request.ApprovalAssetsRequest; import com.daqing.financial.guarantee.model.request.AssetsRequest; import com.daqing.financial.guarantee.model.request.InvestigateAssetsRequest; @@ -20,10 +17,7 @@ import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.financial.guarantee.util.AuditProcessUtil; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.response.CrmsCode; -import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; -import com.daqing.framework.domain.guarantee.DgAssetsAssessmentAssetsLog; -import com.daqing.framework.domain.guarantee.DgAssetsInvestigation; -import com.daqing.framework.domain.guarantee.DgAssetsMoney; +import com.daqing.framework.domain.guarantee.*; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.PromptSuccess; @@ -71,6 +65,12 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl roleIdlist, String userId, Integer status) { @@ -281,6 +281,26 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl() + .eq("business_id",assetsInvestigation.getBusinessId()) + .eq("type",4).eq("status",StatusCode.SP_REVIEWED).eq("operating_status",StatusCode.CZ_PROCESSED)); + + //查看信息部分管领导是否审核通过 + int b=dgMessageInvestigationMapper.selectCount(new QueryWrapper() + .eq("business_id",assetsInvestigation.getBusinessId()) + .eq("type",3).eq("status",StatusCode.SP_REVIEWED).eq("operating_status",StatusCode.CZ_PROCESSED)); + int sum = a+b; + if(sum==2){ + //新增记录到合规调查 + DgComplianceInvestigation compliance =new DgComplianceInvestigation(); + compliance.setCompanyId(assetsInvestigation.getCompanyId());//企业id + compliance.setRoleId(assetsInvestigation.getRoleId());//角色id + compliance.setBusinessId(assetsInvestigation.getBusinessId());//业务id + compliance.setOperationStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理 + compliance.setAuditStatus(StatusCode.SP_TO_BE_ASSIGNED);//审核状态设置为待指派 + dgComplianceInvestigationMapper.insert(compliance); + } //同时往审核流程进程表新增一条记录 String account = dgApplyAmountInfoController.getAccount(); AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,"资产部分管领导",approvalAssetsRequest.getApplyContent()); 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 bc93d300..84a3e1e5 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 @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.feign.CrmsFeignService; -import com.daqing.financial.guarantee.mapper.DgApplyAmountInfoMapper; -import com.daqing.financial.guarantee.mapper.DgEnclosureInfoMapper; -import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper; +import com.daqing.financial.guarantee.mapper.*; import com.daqing.financial.guarantee.model.request.ApprovalGuaranteeRequest; import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest; import com.daqing.financial.guarantee.model.response.*; @@ -17,9 +15,7 @@ import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.financial.guarantee.util.AuditProcessUtil; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.response.CrmsCode; -import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; -import com.daqing.framework.domain.guarantee.DgEnclosureInfo; -import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser; +import com.daqing.framework.domain.guarantee.*; import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.StatusCode; @@ -61,6 +57,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl roleIdlist, String userId, Integer status) { @@ -256,6 +258,26 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl() + .eq("business_id",guaranteeUser.getBusinessId()) + .eq("type",3).eq("status",StatusCode.SP_REVIEWED).eq("operating_status",StatusCode.CZ_PROCESSED)); + + //查看资产部分管领导是否审核通过 + int b=dgAssetsInvestigationMapper.selectCount(new QueryWrapper() + .eq("business_id",guaranteeUser.getBusinessId()) + .eq("type",3).eq("status",StatusCode.SP_REVIEWED).eq("operating_status",StatusCode.CZ_PROCESSED)); + int sum = a+b; + if(sum==2){ + //新增记录到合规调查 + DgComplianceInvestigation compliance =new DgComplianceInvestigation(); + compliance.setCompanyId(guaranteeUser.getCompanyId());//企业id + compliance.setRoleId(guaranteeUser.getRoleId());//角色id + compliance.setBusinessId(guaranteeUser.getBusinessId());//业务id + compliance.setOperationStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理 + compliance.setAuditStatus(StatusCode.SP_TO_BE_ASSIGNED);//审核状态设置为待指派 + dgComplianceInvestigationMapper.insert(compliance); + } //同时往审核流程进程表新增一条记录 String account = dgApplyAmountInfoController.getAccount(); 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 fee22654..7347f9f9 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 @@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.feign.CrmsFeignService; import com.daqing.financial.guarantee.feign.HrmsFeignService; -import com.daqing.financial.guarantee.mapper.DgApplyAmountInfoMapper; -import com.daqing.financial.guarantee.mapper.DgEnclosureInfoMapper; -import com.daqing.financial.guarantee.mapper.DgMessageInvestigationMapper; +import com.daqing.financial.guarantee.mapper.*; import com.daqing.financial.guarantee.model.request.ApprovalMessageRequest; import com.daqing.financial.guarantee.model.request.InvestigateMessageRequest; import com.daqing.financial.guarantee.model.request.MessageRequest; @@ -64,6 +62,12 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl roleIdlist, String userId, Integer status) { @@ -264,6 +268,27 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl() + .eq("business_id",messageInvestigation.getBusinessId()) + .eq("type",4).eq("status",StatusCode.SP_REVIEWED).eq("operating_status",StatusCode.CZ_PROCESSED)); + + //查看资产部分管领导是否审核通过 + int b=dgAssetsInvestigationMapper.selectCount(new QueryWrapper() + .eq("business_id",messageInvestigation.getBusinessId()) + .eq("type",3).eq("status",StatusCode.SP_REVIEWED).eq("operating_status",StatusCode.CZ_PROCESSED)); + int sum = a+b; + if(sum==2){ + //新增记录到合规调查 + DgComplianceInvestigation compliance =new DgComplianceInvestigation(); + compliance.setCompanyId(messageInvestigation.getCompanyId());//企业id + compliance.setRoleId(messageInvestigation.getRoleId());//角色id + compliance.setBusinessId(messageInvestigation.getBusinessId());//业务id + compliance.setOperationStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理 + compliance.setAuditStatus(StatusCode.SP_TO_BE_ASSIGNED);//审核状态设置为待指派 + dgComplianceInvestigationMapper.insert(compliance); + } + //同时往审核流程进程表新增一条记录 String account = dgApplyAmountInfoController.getAccount(); AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部分管领导",approvalMessageRequest.getRemark()); diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceInvestigation.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceInvestigation.java index be44e5af..9b18a2b2 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceInvestigation.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgComplianceInvestigation.java @@ -50,7 +50,12 @@ public class DgComplianceInvestigation implements Serializable { /** * 审核状态 */ - private Integer status; + private Integer auditStatus; + + /** + * 操作状态 + */ + private Integer operationStatus; @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT)