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 1 year ago
parent
d8d96efb20 f2c237009e
commit
e63616d54e
3 changed files with 50 additions and 17 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. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
  3. 50
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -103,6 +103,8 @@ import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService;
import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -198,6 +200,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private LoanDiffFeign loanDiffFeign;
@Autowired
private OtherReceivableBillCreditResultService creditResultService;
@Autowired
private DictCommonFeign dictCommonFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -1831,6 +1835,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1841,6 +1846,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1851,6 +1857,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1861,6 +1868,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
@ -1938,6 +1946,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1948,6 +1957,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1958,6 +1968,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1970,6 +1981,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
creditResult.setResultDetails(collectionDetailDtoListOne);

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
View File

@ -342,6 +342,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -352,6 +353,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -362,6 +364,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -372,6 +375,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -382,6 +386,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
creditResultDetailDto.setRemarks(CwSystemYT.YWXSR.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}

50
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -398,25 +398,25 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
if (loanHomevisitInvestigateCustomerDetailsVo == null) {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
} else {
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())){
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getBankCardNo())) {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
}else {
} else {
loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
}
//其他补充信息状态
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
}else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())){
} else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())) {
loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
}else {
} else {
loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
}
}else {
} else {
loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
}
//合同路径
if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl())){
if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getContractUrl())) {
loanHomeVisitInvestigateInitReportStateVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + loanHomevisitInvestigateCustomerDetailsVo.getContractUrl());
}
}
@ -536,6 +536,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
//资产类
if (yhkImages == null || yhkImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
} else if (fcImages == null || fcImages.size() == 0) {
loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(0);
} else {
loanHomeVisitInvestigateInitInformationStateVo.setAssetsInfo(1);
}
@ -549,10 +551,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitCustomerVo = new LoanHomeVisitInvestigateInitCustomerVo();
String saleOrderBorrowerSid = "";
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
if (loanHomevisitInvestigate == null){
if (loanHomevisitInvestigate == null) {
LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepService.fetchBySid(sid);
saleOrderBorrowerSid = loanHomevisitPrep.getSaleOrderBorrowerSid();
}else {
} else {
saleOrderBorrowerSid = loanHomevisitInvestigate.getSaleOrderBorrowerSid();
}
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(saleOrderBorrowerSid).getData();
@ -583,6 +585,20 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) {
ResultBean rb = ResultBean.fireFail();
List<LoanHomeVisitInvestigateSaveOtherPeoDto> otherPersonnel = dto.getOtherPersonnel();
if (!dto.getActualBuyer()) {
Boolean isExistSjgcr = false;
if (otherPersonnel != null && otherPersonnel.size() > 0) {
for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) {
if ("3".equals(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelKey())) {
isExistSjgcr = true;
break;
}
}
}
if (!isExistSjgcr) {
return rb.setMsg("贷款人和其他人员中必须存在实际购车人");
}
}
List<String> bankCardImages = dto.getBankCardImages();
LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto();
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(dto.getSid());
@ -1014,9 +1030,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
}
List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){
if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {
for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())){
if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())) {
//担保人身份证
List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
List<String> pohkbImage = new ArrayList<>();
@ -1451,12 +1467,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
financeForm25.setValue("关系：" + loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue());
userInfo.add(financeForm25);
}
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
FinanceForm financeForm60 = new FinanceForm();
financeForm60.setValue("车辆登记在：客户下");
financeForm60.setSpanSize(2);
otherInfo.add(financeForm60);
}else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
} else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
FinanceForm financeForm61 = new FinanceForm();
financeForm61.setValue("车辆登记在：挂靠公司下");
financeForm61.setSpanSize(2);
@ -1467,12 +1483,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
financeForm62.setType(1);
financeForm62.setBold(true);
otherInfo.add(financeForm62);
if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())){
if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())) {
FinanceForm financeForm63 = new FinanceForm();
financeForm63.setValue("挂靠公司是否担保：是");
financeForm63.setSpanSize(2);
otherInfo.add(financeForm63);
}else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())){
} else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())) {
FinanceForm financeForm64 = new FinanceForm();
financeForm64.setValue("挂靠公司是否担保：否");
financeForm64.setSpanSize(2);
@ -1836,7 +1852,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
public void updateState(String sid, String state) {
baseMapper.updateState(sid,state);
baseMapper.updateState(sid, state);
}
public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {

Write Preview
Loading…
Cancel
Save