提交代码

master
chen 4 years ago
parent 4e0f44fdbf
commit af532f936e
  1. 1
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
  2. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
  3. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
  4. 284
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
  5. 3
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml

@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.List;
/** /**
* <p> * <p>

@ -45,6 +45,10 @@ public class PaymentConfirmationListResponse {
@ApiModelProperty("附件(会议记录)") @ApiModelProperty("附件(会议记录)")
private String file; private String file;
@ExcelIgnore
@ApiModelProperty("回单图片")
private String imgFile;
@ApiModelProperty("业务编号") @ApiModelProperty("业务编号")
@ExcelProperty(value = "业务编号",index = 0) @ExcelProperty(value = "业务编号",index = 0)
private String businessCode; private String businessCode;

@ -146,7 +146,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
//更新成功,更新回款确认的财务部经理数据 //更新成功,更新回款确认的财务部经理数据
if (update > 0){ if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>(); QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID); queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
DgPaymentConfirmationConsider paymentConfirmationConsider = paymentConfirmationConsiderMapper.selectOne(queryWrapper); DgPaymentConfirmationConsider paymentConfirmationConsider = paymentConfirmationConsiderMapper.selectOne(queryWrapper);
paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT); paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT);
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_ON_HAND); paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_ON_HAND);

@ -104,97 +104,207 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
String imgFile = paymentConfirmationUpdateRequest.getImgFile(); String imgFile = paymentConfirmationUpdateRequest.getImgFile();
//状态为2表示通过,为4表示驳回 //状态为2表示通过,为4表示驳回
Integer status = paymentConfirmationUpdateRequest.getStatus(); Integer status = paymentConfirmationUpdateRequest.getStatus();
//获取当前用户拥有的角色ids
//回款确认无驳回操作 String roleIds = RedisUtil.get("dq:userRole:" + currentUser);
//更新之前,获取此数据的审批状态,如果审批状态为驳回,则更新法规部经理数据,如果审批状态为审批中,则添加放款通知数据 List<String> roleIdList = null;
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperTemp = new QueryWrapper<>(); if(roleIds != null) {
queryWrapperTemp.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID); String[] ids = roleIds.split(",");
DgPaymentConfirmationConsider paymentConfirmationConsiderTemp = baseMapper.selectOne(queryWrapperTemp); roleIdList = Arrays.asList(ids);
Integer approveStatus = paymentConfirmationConsiderTemp.getStatus();
//之前状态为审批中,同意则添加放款通知数据给法规部经理
if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
paymentConfirmationConsider.setAuditOpinion(auditOpinion);
paymentConfirmationConsider.setConsiderId(currentUser);
paymentConfirmationConsider.setStatus(StatusCode.SP_REVIEWED);
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
paymentConfirmationConsider.setImgFile(imgFile);
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
Integer companyId = paymentConfirmationConsider.getCompanyId();
//更新成功,添加法规部经理数据
if (update > 0){
DgLoanNotice loanNotice = new DgLoanNotice();
loanNotice.setCompanyId(companyId);
loanNotice.setBusinessId(businessId);
loanNotice.setRoleId(PromptSuccess.FG_JL_ID);
int insert = dgLoanNoticeMapper.insert(loanNotice);
//更新成功,返回操作结果
log.info(insert > 0 ? "财务部经理确认成功" : "财务部经理确认失败");
return insert > 0;
}
} }
//之前状态为驳回,同意则更新放款通知数据给法规部经理 //*************************************************根据角色更新数据************************************************
if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>(); //角色不为空
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID); if (roleIdList!=null){
DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
paymentConfirmationConsider.setAuditOpinion(auditOpinion); //角色为财务部经理回款确认操作和驳回操作
paymentConfirmationConsider.setConsiderId(currentUser); if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID))){
paymentConfirmationConsider.setStatus(StatusCode.SP_REVIEWED); //回款确认无驳回操作
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED); //更新之前,获取此数据的审批状态,如果审批状态为驳回,则更新法规部经理数据,如果审批状态为审批中,则添加法规部经理数据—_—
paymentConfirmationConsider.setImgFile(imgFile); QueryWrapper<DgPaymentConfirmationConsider> queryWrapperTemp = new QueryWrapper<>();
int update = baseMapper.updateById(paymentConfirmationConsider); queryWrapperTemp.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
//同时往审核流程进程表新增一条记录 DgPaymentConfirmationConsider paymentConfirmationConsiderTemp = baseMapper.selectOne(queryWrapperTemp);
String account = DgApplyAmountInfoController.getAccount(); Integer approveStatus = paymentConfirmationConsiderTemp.getStatus();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9);
//更新成功,更新法规部经理数据 //之前状态为审批中,同意则添加回款确认数据给法规部经理
if (update > 0){ if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){
QueryWrapper<DgLoanNotice> loanNoticeQueryWrapper = new QueryWrapper<>(); QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
loanNoticeQueryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID); queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
DgLoanNotice loanNotice = dgLoanNoticeMapper.selectOne(loanNoticeQueryWrapper); DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
//清空审批意见 paymentConfirmationConsider.setAuditOpinion(auditOpinion);
loanNotice.setAuditOpinion(""); paymentConfirmationConsider.setConsiderId(currentUser);
loanNotice.setStatus(StatusCode.SP_IN_REVIEW); paymentConfirmationConsider.setStatus(StatusCode.SP_REVIEWED);
loanNotice.setOperatingStatus(StatusCode.CZ_ON_HAND); paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
int updateById = dgLoanNoticeMapper.updateById(loanNotice); paymentConfirmationConsider.setImgFile(imgFile);
//更新成功,返回操作结果 int update = baseMapper.updateById(paymentConfirmationConsider);
log.info(updateById > 0 ? "驳回后再次财务部经理确认成功" : "驳回后再次财务部经理确认失败"); //同时往审核流程进程表新增一条记录
return updateById > 0; String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
Integer companyId = paymentConfirmationConsider.getCompanyId();
//更新成功,添加法规部经理数据
if (update > 0){
DgPaymentConfirmationConsider dgPaymentConfirmationConsider = new DgPaymentConfirmationConsider();
dgPaymentConfirmationConsider.setRoleId(PromptSuccess.FG_JL_ID);
dgPaymentConfirmationConsider.setBusinessId(businessId);
dgPaymentConfirmationConsider.setCompanyId(companyId);
dgPaymentConfirmationConsider.setImgFile(imgFile);
int insert = baseMapper.insert(dgPaymentConfirmationConsider);
//更新成功,返回操作结果
log.info(insert > 0 ? "财务部经理确认成功" : "财务部经理确认失败");
return insert > 0;
}
}
//之前状态为驳回,同意则更新回款确认数据给法规部经理
if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
paymentConfirmationConsider.setAuditOpinion(auditOpinion);
paymentConfirmationConsider.setConsiderId(currentUser);
paymentConfirmationConsider.setStatus(StatusCode.SP_REVIEWED);
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
paymentConfirmationConsider.setImgFile(imgFile);
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9);
//更新成功,更新法规部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> wrapperTemp = new QueryWrapper<>();
wrapperTemp.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
DgPaymentConfirmationConsider paymentConfirmationTemp = baseMapper.selectOne(wrapperTemp);
paymentConfirmationTemp.setAuditOpinion("");
paymentConfirmationTemp.setStatus(StatusCode.SP_IN_REVIEW);
paymentConfirmationTemp.setOperatingStatus(StatusCode.CZ_ON_HAND);
int updateById = baseMapper.updateById(paymentConfirmationTemp);
//更新成功,返回操作结果
log.info(updateById > 0 ? "驳回后再次财务部经理确认成功" : "驳回后再次财务部经理确认失败");
return updateById > 0;
}
}
//驳回操作,更新数据和资产部经理数据及返回上一流程
if (StatusCode.SP_REJECT.equals(status)){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
paymentConfirmationConsider.setAuditOpinion(auditOpinion);
paymentConfirmationConsider.setConsiderId(currentUser);
paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT);
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
paymentConfirmationConsider.setImgFile(imgFile);
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9);
//更新成功,更新资产部经理数据
if (update > 0){
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);
int updateById = guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUser);
//更新成功,返回操作结果
log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");
return updateById > 0;
}
}
} }
}
//驳回操作,更新数据和资产部经理数据及返回上一流程
if (StatusCode.SP_REJECT.equals(status)){ //角色为法规部经理回款确认操作和驳回操作
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>(); if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID); //更新之前,获取此数据的审批状态,如果审批状态为驳回,则更新法规部经理数据,如果审批状态为审批中,则添加法规部经理数据—_—
DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper); QueryWrapper<DgPaymentConfirmationConsider> queryWrapperTemp = new QueryWrapper<>();
paymentConfirmationConsider.setAuditOpinion(auditOpinion); queryWrapperTemp.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
paymentConfirmationConsider.setConsiderId(currentUser); DgPaymentConfirmationConsider paymentConfirmationConsiderTemp = baseMapper.selectOne(queryWrapperTemp);
paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT); Integer approveStatus = paymentConfirmationConsiderTemp.getStatus();
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
paymentConfirmationConsider.setImgFile(imgFile); //之前状态为审批中,同意则添加放款通知数据给法规部经理
int update = baseMapper.updateById(paymentConfirmationConsider); if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){
//同时往审核流程进程表新增一条记录 QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
String account = DgApplyAmountInfoController.getAccount(); queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9); DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
//更新成功,更新资产部经理数据 paymentConfirmationConsider.setAuditOpinion(auditOpinion);
if (update > 0){ paymentConfirmationConsider.setConsiderId(currentUser);
QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapper = new QueryWrapper<>(); paymentConfirmationConsider.setStatus(StatusCode.SP_REVIEWED);
guaranteeLetterAssignUserQueryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.ZC_JL_ID); paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapper); int update = baseMapper.updateById(paymentConfirmationConsider);
dgGuaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT);
dgGuaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND); //同时往审核流程进程表新增一条记录
int updateById = guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUser); String account = DgApplyAmountInfoController.getAccount();
//更新成功,返回操作结果 AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9);
log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败"); Integer companyId = paymentConfirmationConsider.getCompanyId();
return updateById > 0; //更新成功,添加法规部经理数据
if (update > 0){
DgLoanNotice loanNotice = new DgLoanNotice();
loanNotice.setCompanyId(companyId);
loanNotice.setBusinessId(businessId);
loanNotice.setRoleId(PromptSuccess.FG_JL_ID);
int insert = dgLoanNoticeMapper.insert(loanNotice);
//更新成功,返回操作结果
log.info(insert > 0 ? "法规部经理确认成功" : "法规部经理确认失败");
return insert > 0;
}
}
//之前状态为驳回,同意则更新放款通知数据给法规部经理
if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
paymentConfirmationConsider.setAuditOpinion(auditOpinion);
paymentConfirmationConsider.setConsiderId(currentUser);
paymentConfirmationConsider.setStatus(StatusCode.SP_REVIEWED);
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion, 9);
//更新成功,更新法规部经理数据
if (update > 0){
QueryWrapper<DgLoanNotice> loanNoticeQueryWrapper = new QueryWrapper<>();
loanNoticeQueryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
DgLoanNotice loanNotice = dgLoanNoticeMapper.selectOne(loanNoticeQueryWrapper);
//清空审批意见
loanNotice.setAuditOpinion("");
loanNotice.setStatus(StatusCode.SP_IN_REVIEW);
loanNotice.setOperatingStatus(StatusCode.CZ_ON_HAND);
int updateById = dgLoanNoticeMapper.updateById(loanNotice);
//更新成功,返回操作结果
log.info(updateById > 0 ? "驳回后再次财务部经理确认成功" : "驳回后再次财务部经理确认失败");
return updateById > 0;
}
}
//驳回操作,更新数据和财务部经理数据及返回上一流程
if (StatusCode.SP_REJECT.equals(status)){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
DgPaymentConfirmationConsider paymentConfirmationConsider = baseMapper.selectOne(queryWrapper);
paymentConfirmationConsider.setAuditOpinion(auditOpinion);
paymentConfirmationConsider.setConsiderId(currentUser);
paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT);
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_PROCESSED);
int update = baseMapper.updateById(paymentConfirmationConsider);
//同时往审核流程进程表新增一条记录
String account = DgApplyAmountInfoController.getAccount();
AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9);
//更新成功,更新财务部经理数据
if (update > 0){
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperT = new QueryWrapper<>();
queryWrapperT.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
DgPaymentConfirmationConsider paymentConfirmationConsiderT = baseMapper.selectOne(queryWrapperT);
paymentConfirmationConsiderT.setOperatingStatus(StatusCode.CZ_ON_HAND);
paymentConfirmationConsiderT.setStatus(StatusCode.SP_REJECT);
int updateById = baseMapper.updateById(paymentConfirmationConsiderT);
//更新成功,返回操作结果
log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");
return updateById > 0;
}
}
} }
} }

@ -31,11 +31,12 @@
<result column="operating_status" property="operatingStatus" /> <result column="operating_status" property="operatingStatus" />
<result column="business_status" property="businessStatus" /> <result column="business_status" property="businessStatus" />
<result column="business_id" property="businessId" /> <result column="business_id" property="businessId" />
<result column="img_file" property="imgFile" />
</resultMap> </resultMap>
<select id="pageByCondition" resultMap="PaymentConfirmationListResponseMap"> <select id="pageByCondition" resultMap="PaymentConfirmationListResponseMap">
select pcc.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time, select pcc.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,
pcc.status,aai.bank,lcc.passing_time,lcc.file,pcc.audit_opinion,pcc.operating_status,bps.business_status,pcc.business_id pcc.status,aai.bank,lcc.passing_time,lcc.file,pcc.audit_opinion,pcc.operating_status,bps.business_status,pcc.business_id,pcc.img_file
from dg_payment_confirmation_consider pcc from dg_payment_confirmation_consider pcc
left join dg_apply_amount_info aai on pcc.business_id = aai.id left join dg_apply_amount_info aai on pcc.business_id = aai.id
left join crms_company_customer ccc on pcc.company_id = ccc.id left join crms_company_customer ccc on pcc.company_id = ccc.id

Loading…
Cancel
Save