yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
d17f5ca04e b28b4507d5
commit
e79b9b3ff9
1 changed files with 40 additions and 18 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. 58
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

58
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
View File

@ -1751,7 +1751,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
}
}
if (isTrue) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 1) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
@ -1759,11 +1759,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
} else {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
}
}
@ -1784,7 +1788,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
}
}
if (isTrue) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 1) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
@ -1792,11 +1796,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
} else {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
}
}
@ -2437,20 +2445,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
}
}
if (query.isOtherPolicyState()) {
if (StringUtils.isNotBlank(query.getPolicySid()) && query.isOtherPolicyState()) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(query.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}
} else {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(query.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyIsMain(true);
}
LoanFinOtherPolicy loanFinOtherPolicys = loanFinOtherPolicyService.selectByMainSid(query.getPolicySid());
if (loanFinOtherPolicys != null) {
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
//验证贷款金额是否不大于最高贷款金额
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
@ -2487,6 +2486,21 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
}
}
}
}else{
if (StringUtils.isNotBlank(query.getPolicySid()) && !query.isOtherPolicyState()) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(query.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
}
}
@ -2531,7 +2545,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
solutionssVo.setShowMore(true);
solutionssVo.setFactoryDiscountUse("抵利息");
if (isTrue) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 1) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
@ -2539,11 +2553,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
} else {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
}
LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
@ -2568,7 +2586,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
solutionssVo.setShowMore(true);
solutionssVo.setFactoryDiscountUse("抵利息");
if (isTrue) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 1) {
if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
@ -2576,11 +2594,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
} else {
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
if (loanFinOtherPolicy != null) {
solutionssVo.setOtherPolicyIsMain(true);
}else{
solutionssVo.setOtherPolicyIsMain(false);
}
}
LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());

Write Preview
Loading…
Cancel
Save