huoran
/
dqFinancial
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
shijie 4 years ago
parent adefa8bee9 a38d804feb
commit 726df90603
16 changed files with 92 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java
  2. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
  3. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java
  4. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
  5. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
  6. 24
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
  7. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
  8. 31
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
  9. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java
  10. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
  11. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
  12. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
  13. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
  14. 5
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
  15. 9
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java
  16. 2
      dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java

7
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java
Unescape View File

@ -6,6 +6,9 @@ import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusR
import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import com.daqing.framework.domain.hrms.response.HrmsCode;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.StatusCode;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.utils.DateUtil;
import com.daqing.framework.utils.PageUtils;
@ -73,6 +76,10 @@ public class DgGuaranteeLetterAssignUserController {
public ResponseResult updateStatus(
@ApiParam(name = "guaranteeLetterUpdateStatusRequest", value = "更新确认状态请求", required = true)
@RequestBody GuaranteeLetterUpdateStatusRequest guaranteeLetterUpdateStatusRequest) {
//如果为驳回操作且无审核意见，抛出异常
if (StatusCode.SP_REJECT.equals(guaranteeLetterUpdateStatusRequest.getStatus()) && guaranteeLetterUpdateStatusRequest.getAuditOpinion().length()==0){
ExceptionCast.cast(HrmsCode.EMPTY_OPINION);
}
boolean result = guaranteeLetterAssignUserService.updateGuaranteeLetterStatus(guaranteeLetterUpdateStatusRequest);
return result ? ResponseResult.SUCCESS("确认成功！"):ResponseResult.FAIL(40005,"确认失败！");
}

7
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
Unescape View File

@ -8,6 +8,9 @@ import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserServic
import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
import com.daqing.financial.guarantee.service.impl.DgGuaranteeLetterAssignUserServiceImpl;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import com.daqing.framework.domain.hrms.response.HrmsCode;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.StatusCode;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.utils.DateUtil;
import com.daqing.framework.utils.NumberToCN;
@ -67,6 +70,10 @@ public class DgLoanNoticeController {
public ResponseResult updateLoanNotice(
@ApiParam(name = "loanNoticeUpdateRequest", value = "更新放款通知请求", required = true)
@RequestBody LoanNoticeUpdateRequest loanNoticeUpdateRequest) {
//如果为驳回操作且无审核意见，抛出异常
if (StatusCode.SP_REJECT.equals(loanNoticeUpdateRequest.getStatus()) && loanNoticeUpdateRequest.getAuditOpinion().length()==0){
ExceptionCast.cast(HrmsCode.EMPTY_OPINION);
}
boolean result = loanNoticeService.updateLoanNotice(loanNoticeUpdateRequest);
return result ? ResponseResult.SUCCESS("更新成功！"):ResponseResult.FAIL(40005,"更新失败！");
}

7
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java
Unescape View File

@ -5,6 +5,9 @@ import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequ
import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
import com.daqing.framework.domain.hrms.response.HrmsCode;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.StatusCode;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.utils.PageUtils;
import io.swagger.annotations.Api;
@ -58,6 +61,10 @@ public class DgPaymentConfirmationConsiderController {
public ResponseResult updatePaymentConfirmation(
@ApiParam(name = "paymentConfirmationUpdateRequest", value = "更新回款确认请求", required = true)
@RequestBody PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest) {
//如果为驳回操作且无审核意见，抛出异常
if (StatusCode.SP_REJECT.equals(paymentConfirmationUpdateRequest.getStatus()) && paymentConfirmationUpdateRequest.getAuditOpinion().length()==0){
ExceptionCast.cast(HrmsCode.EMPTY_OPINION);
}
boolean result = paymentConfirmationConsiderService.updatePaymentConfirmation(paymentConfirmationUpdateRequest);
return result ? ResponseResult.SUCCESS("更新成功！"):ResponseResult.FAIL(40005,"更新失败！");
}

6
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
Unescape View File

@ -202,7 +202,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
//如果不为保存就往审核流程进程表新增一条记录
if(businessApplication.getIsSaveOrCommit()==1){
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1);
AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1,"","","");
}
return 1;
}
@ -422,7 +422,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
.eq("type",applyAmountList.getType()));
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保业务员","",1);
AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保业务员","",1,"","","");
//将业务流程状态设置为已撤销
@ -582,7 +582,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
}
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,deptName,remark,1);
AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,deptName,remark,1,"","","");
return 1;
}

4
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
Unescape View File

@ -298,7 +298,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
}
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(dgAssetsInvestigation.getBusinessId(),account,"资产部专员",investigateAssetsRequest.getApplyContent(),3);
AuditProcessUtil.save(dgAssetsInvestigation.getBusinessId(),account,"资产部专员",investigateAssetsRequest.getApplyContent(),3,"","","");
return 1;
}
@ -425,7 +425,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
}
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,deptName,approvalAssetsRequest.getApplyContent(),3);
AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,deptName,approvalAssetsRequest.getApplyContent(),3,"","","");
return 1;
}

24
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
Unescape View File

@ -137,7 +137,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
// 在审核进程表中插入一条指派成功的数据
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_JL_NAME, null, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_JL_NAME, null, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -176,7 +176,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
// 在业务流程表中插入一条调查成功的数据
if (result2) {
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -203,7 +203,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result3) {
// 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -242,7 +242,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result1) {
// 在业务流程表中插入一条法规经理同意的数据
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -264,7 +264,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
// 在业务流程表中插入一条法规经理驳回的数据
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -287,7 +287,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -328,7 +328,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result1) {
// 在业务流程表中插入一条法规经理审核成功的数据
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -350,7 +350,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
// 在业务流程表中插入一条法规经理驳回的数据
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -373,7 +373,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -414,7 +414,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result1) {
// 在业务流程表中插入一条法规领导审核成功的数据
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -440,7 +440,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
// 在业务流程表中插入一条法规领导驳回的数据
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}
@ -467,7 +467,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
if (result2) {
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
}
}
}

6
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
Unescape View File

@ -382,7 +382,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
//不为保存的情况则往审核流程进程表新增一条记录
if(!investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_DRAFT)){
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2);
AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2,"","","");
}
return 1;
}
@ -508,7 +508,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
}
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(guaranteeUser.getBusinessId(), account, deptName, approvalGuaranteeRequest.getApplyContent(), 2);
AuditProcessUtil.save(guaranteeUser.getBusinessId(), account, deptName, approvalGuaranteeRequest.getApplyContent(), 2,"","","");
return 1;
}
@ -617,7 +617,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
}
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(guaranteeRequest.getBusinessId(), account, "担保部经理", "", 2);
AuditProcessUtil.save(guaranteeRequest.getBusinessId(), account, "担保部经理", "", 2,"","","");
return ResponseResult.SUCCESS();
}

31
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
Unescape View File

@ -19,6 +19,8 @@ import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider;
import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider;
import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.exception.ExceptionCatch;
import com.daqing.framework.model.StatusCode;
import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.util.RedisUtil;
@ -92,7 +94,6 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
String customerNumberOrName = guaranteeLetterQueryRequest.getCustomerNumberOrName();
//获取当前登录用户id
Integer userId = Integer.parseInt(this.getUserId());
//获取当前用户拥有的角色ids
String roleIds = RedisUtil.get("dq:userRole:" + userId);
IPage<GuaranteeLetterListResponse> guaranteeLetterVO = null;
@ -169,7 +170,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,"","","");
//更新成功，添加ab角数据
if (i > 0){
//获取之前指定的a角用户
@ -214,7 +215,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
int i = baseMapper.updateById(guaranteeLetterAssignUser);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,"","","");
//更新成功，更新ab角数据及资产部经理数据
if (i > 0){
//更新a角
@ -273,7 +274,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
int i = baseMapper.updateById(guaranteeLetterAssignUser);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,"","","");
//更新成功，更新贷审会数据
if (i > 0){
//根据业务id查询贷审会数据
@ -313,7 +314,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
int i = baseMapper.updateById(guaranteeLetterAssignUser);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,"","","");
//获取公司id
Integer companyId = guaranteeLetterAssignUser.getCompanyId();
//更新成功，添加回款确认数据及更新整个业务的审核状态
@ -369,7 +370,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
int i = baseMapper.updateById(guaranteeLetterAssignUser);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,"","","");
//更新成功，更新回款确认数据及更新整个业务的审核状态
if (i > 0){
//更新法规部经理数据
@ -427,7 +428,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
int i = baseMapper.updateById(guaranteeLetterAssignUser);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,"","","");
//更新成功，更新AB角数据
if (i > 0){
//更新法规部经理数据
@ -489,7 +490,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
log.info(i > 0 ? "首次a角用户确认担保函更新成功" : "首次a角用户确认担保函更新失败");
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","","");
//更新成功后，判断b角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -506,8 +507,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
int insert = baseMapper.insert(ZCJLGuaranteeLetterAssign);
//添加成功，返回操作结果
log.info(insert > 0 ? "资产部经理添加成功" : "资产部经理添加失败");
//b用户审核没通过，返回结果
return insert > 0;
//b用户审核没通过，返回结果
}else {
return true;
}
@ -527,7 +528,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
log.info(i > 0 ? "驳回后a角用户确认担保函更新成功" : "驳回后a角用户确认担保函更新失败");
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","","");
//更新成功后，判断b角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -547,8 +548,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
int update = baseMapper.updateById(letterAssignUserZCJL);
//更新成功，返回操作结果
log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败");
return update > 0;
//b用户审核没通过，返回结果
return update > 0;
}else {
return true;
}
@ -568,7 +569,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
log.info(i > 0 ? "a角用户驳回担保函更新成功" : "a角用户驳回担保函更新失败");
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","","");
//更新成功后，更新b角数据及更新法规部经理数据
if (i > 0){
//更新b用户的审核状态为驳回，操作状态为已处理
@ -617,7 +618,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
log.info(i > 0 ? "首次b角用户确认担保函更新成功" : "首次b角用户确认担保函更新失败");
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","","");
//更新成功后，判断a角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -656,7 +657,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
log.info(i > 0 ? "驳回后b角用户确认担保函更新成功" : "驳回后b角用户确认担保函更新失败");
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","","");
//更新成功后，判断a角用户是否确认
if (i > 0){
QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@ -697,7 +698,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
log.info(i > 0 ? "b角用户驳回担保函更新成功" : "b角用户驳回担保函更新失败");
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8);
AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","","");
//更新成功后，更新a角数据及更新法规部经理数据
if (i > 0){
//更新a用户的审核状态为驳回，操作状态为已处理

6
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java
Unescape View File

@ -146,7 +146,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
// 在业务流程表中插入一条审议成功的数据
return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.DSH_NAME, null, PromptSuccess.DSH_PROCESS_ID);
PromptSuccess.DSH_NAME, null, PromptSuccess.DSH_PROCESS_ID,"","","");
}
}
}
@ -178,7 +178,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID);
PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,"","","");
}
}
}
@ -216,7 +216,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
// 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID);
PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,"","","");
}
}
}

4
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
Unescape View File

@ -116,7 +116,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
int update = baseMapper.updateById(loanNotice);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10,"","","");
//更新成功更新业务流程已完成
if (update > 0){
QueryWrapper<DgBusinessProcessStatus> businessProcessStatusQueryWrapper = new QueryWrapper<>();
@ -142,7 +142,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
int update = baseMapper.updateById(loanNotice);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10,"","","");
//更新成功，更新回款确认的法规部经理和财务部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();

4
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
Unescape View File

@ -278,7 +278,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部专员",investigateMessageRequest.getRemark(),4);
AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部专员",investigateMessageRequest.getRemark(),4,"","","");
return 1;
}
@ -399,7 +399,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
}
//同时往审核流程进程表新增一条记录
String account = dgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,deptName,approvalMessageRequest.getRemark(),4);
AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,deptName,approvalMessageRequest.getRemark(),4,"","","");
return 1;
}

18
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
Unescape View File

@ -143,7 +143,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9,"","","");
Integer companyId = paymentConfirmationConsider.getCompanyId();
//更新成功，添加法规部经理数据
if (update > 0){
@ -172,7 +172,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9);
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9,"","","");
//更新成功，更新法规部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> wrapperTemp = new QueryWrapper<>();
@ -201,7 +201,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9,"","","");
//更新成功，更新资产部经理数据及其他人的数据
if (update > 0){
//更新法规部经理数据
@ -209,7 +209,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperFg = new QueryWrapper<>();
guaranteeLetterAssignUserQueryWrapperFg.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserFg = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapperFg);
dgGuaranteeLetterAssignUserFg.setStatus(StatusCode.SP_REVIEWED);
dgGuaranteeLetterAssignUserFg.setStatus(StatusCode.SP_REJECT);
guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserFg);
//更新a角
@ -217,7 +217,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperA = new QueryWrapper<>();
guaranteeLetterAssignUserQueryWrapperA.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserA = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapperA);
dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REVIEWED);
dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT);
guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserA);
//更新b角
@ -225,7 +225,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperB = new QueryWrapper<>();
guaranteeLetterAssignUserQueryWrapperB.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID);
DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserB = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapperB);
dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REVIEWED);
dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REJECT);
guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUserB);
QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapper = new QueryWrapper<>();
@ -264,7 +264,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9,"","","");
Integer companyId = paymentConfirmationConsider.getCompanyId();
//更新成功，添加法规部经理数据和更新财务部数据
if (update > 0){
@ -297,7 +297,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion, 9);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion, 9,"","","");
//更新成功，更新法规部经理数据和财务部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperCwb = new QueryWrapper<>();
@ -332,7 +332,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9);
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9,"","","");
//更新成功，更新财务部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperT = new QueryWrapper<>();

8
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
Unescape View File

@ -155,7 +155,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
if (result) {
// 在业务流程表中插入一条审议通过的数据
return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,"","","");
}
}
// 拒绝
@ -179,7 +179,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
if (result2) {
// 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,"","","");
}
}
}
@ -210,7 +210,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
if (result3) {
// 在业务流程表中插入一条工作会驳回的数据
return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,"","","");
}
}
}
@ -262,7 +262,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
if (result2) {
// 在业务流程表中插入一条评委抽取成功的数据
return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
PromptSuccess.GZU_NAME, null, PromptSuccess.GZU_PROCESS_ID);
PromptSuccess.GZU_NAME, null, PromptSuccess.GZU_PROCESS_ID,"","","");
}
}
}

5
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
Unescape View File

@ -26,13 +26,16 @@ public class AuditProcessUtil{
auditProcessUtil.auditProcessMapper = this.auditProcessMapper;
}
public static boolean save(Integer businessId, String approver, String deptName, String auditOpinion,Integer processId) {
public static boolean save(Integer businessId, String approver, String deptName, String auditOpinion,Integer processId,String reason,String loanMoney,String loanTern) {
DgAuditProcess auditProcess = new DgAuditProcess();
auditProcess.setApprover(approver);
auditProcess.setAuditOpinion(auditOpinion);
auditProcess.setBusinessId(businessId);
auditProcess.setDeptName(deptName);
auditProcess.setProcessId(processId);
auditProcess.setLoanMoney(loanMoney);
auditProcess.setLoanTern(loanTern);
auditProcess.setReason(reason);
int insert = auditProcessUtil.auditProcessMapper.insert(auditProcess);
return insert > 0;
}

9
dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java
Unescape View File

@ -49,4 +49,13 @@ public class DgAuditProcess implements Serializable {
@ApiModelProperty(value = "审批意见")
private String auditOpinion;
@ApiModelProperty(value = "驳回原因")
private String reason;
@ApiModelProperty(value = "申请金额")
private String loanMoney;
@ApiModelProperty(value = "申请期限")
private String loanTern;
}

2
dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java
Unescape View File

@ -77,6 +77,8 @@ public enum HrmsCode implements ResultCode {
ROLE_NAME_EXIST(false,44002,"该角色名称已存在，请重新输入！"),
EMP_POSITION_EXSIT(false, 22006, "该职位下已关联员工！"),
EMPTY_OPINION(false, 10000, "请填写审核意见！"),
EMP_SAME(false, 51001, "A,B角不能选同一个人！"),
EMP_TO_BE_CHOOSE(false, 51002, "该用户已经被指派！");

Write Preview
Loading…
Cancel
Save