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 a0f4e37d0e af532f936e
commit 2cb6b77438
5 changed files with 204 additions and 90 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. 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. 142
      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

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

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

4
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
Unescape View File

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

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

@ -146,7 +146,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
//更新成功，更新回款确认的财务部经理数据
if (update > 0){
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);
paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT);
paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_ON_HAND);

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

@ -104,15 +104,29 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
String imgFile = paymentConfirmationUpdateRequest.getImgFile();
//状态为2表示通过，为4表示驳回
Integer status = paymentConfirmationUpdateRequest.getStatus();
//获取当前用户拥有的角色ids
String roleIds = RedisUtil.get("dq:userRole:" + currentUser);
List<String> roleIdList = null;
if(roleIds != null) {
String[] ids = roleIds.split(",");
roleIdList = Arrays.asList(ids);
}
//*************************************************根据角色更新数据************************************************
//角色不为空
if (roleIdList!=null){
//角色为财务部经理回款确认操作和驳回操作
if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID))){
//回款确认无驳回操作
//更新之前,获取此数据的审批状态，如果审批状态为驳回，则更新法规部经理数据，如果审批状态为审批中，则添加放款通知数据
//更新之前,获取此数据的审批状态，如果审批状态为驳回，则更新法规部经理数据，如果审批状态为审批中，则添加法规部经理数据—_—
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperTemp = new QueryWrapper<>();
queryWrapperTemp.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
DgPaymentConfirmationConsider paymentConfirmationConsiderTemp = baseMapper.selectOne(queryWrapperTemp);
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);
@ -129,18 +143,19 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
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);
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);
@ -156,14 +171,13 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
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);
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;
@ -197,6 +211,102 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
return updateById > 0;
}
}
}
//角色为法规部经理回款确认操作和驳回操作
if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){
//更新之前,获取此数据的审批状态，如果审批状态为驳回，则更新法规部经理数据，如果审批状态为审批中，则添加法规部经理数据—_—
QueryWrapper<DgPaymentConfirmationConsider> queryWrapperTemp = new QueryWrapper<>();
queryWrapperTemp.eq("business_id",businessId).eq("role_id", PromptSuccess.FG_JL_ID);
DgPaymentConfirmationConsider paymentConfirmationConsiderTemp = baseMapper.selectOne(queryWrapperTemp);
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.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);
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.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;
}
}
}
}
//一个判断都不走，直接返回false
log.info("《《《《《数据更新失败，请确保数据完整》》》》》");

3
dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml
Unescape View File

@ -31,11 +31,12 @@
<result column="operating_status" property="operatingStatus" />
<result column="business_status" property="businessStatus" />
<result column="business_id" property="businessId" />
<result column="img_file" property="imgFile" />
</resultMap>
<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,
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
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

Write Preview
Loading…
Cancel
Save