|
|
@@ -468,8 +468,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
//A角色审核不通过 audit_schedule = 2的时候贷款申请进度处于担保初审状态
|
|
|
} else if (THR.equals(auditType) && auditSchedule.equals(TWO)) {
|
|
|
loanApplication.setLoanSchedule(THR);
|
|
|
- loanApplication.setAuditType(auditType);
|
|
|
- loanApplication.setAuditSchedule(auditSchedule);
|
|
|
+ loanApplication.setAuditType(FOR);
|
|
|
loanApplication.setLoanApplicationType(TWO);
|
|
|
loanApplicationMapper.updateLoanApplication(loanApplication);
|
|
|
//给A角色，审核管理员发送待办
|
|
|
@@ -877,12 +876,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
} else {
|
|
|
//如果是待审核的撤销就退一步否则就是改为待审核
|
|
|
if (ONE.equals(auditType) ) {
|
|
|
- loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
|
|
|
- loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
|
|
|
+ String reviewSchedule = loanApplication.getReviewSchedule();
|
|
|
//等于6：评审会撤销
|
|
|
- if (SIX.equals(loanSchedule)) {
|
|
|
+ if (SIX.equals(loanSchedule) && !ONE.equals(reviewSchedule)) {
|
|
|
loanApplication.setReviewSchedule(ONE);
|
|
|
- String reviewSchedule = loanApplication.getReviewSchedule();
|
|
|
if (FOR.equals(reviewSchedule)){
|
|
|
//撤销到确认上会
|
|
|
loanApplication.setReviewSchedule(THR);
|
|
|
@@ -890,6 +887,9 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
//删掉参会人员
|
|
|
sysUserConferenceMapper.deleteSysUserConferenceByTime(loanApplicationOld.getReviewTime(),loanApplicationOld.getLoanApplicationId());
|
|
|
}
|
|
|
+ }else {
|
|
|
+ loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
|
|
|
+ loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
|
|
|
}
|
|
|
//撤销完成后是到上会评审=评审会进度到 3：同意上会
|
|
|
if (SIX.equals(loanApplication.getLoanSchedule())){
|
Administrator