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

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
9a076179f3 9589231918
commit
f2c237009e
15 changed files with 146 additions and 30 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. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
  2. 14
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java
  3. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java
  4. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  5. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java
  6. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
  7. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java
  8. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
  9. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json
  10. 8
      anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
  11. 8
      anrui-riskcenter-ui/src/views/loanbalancerecognition/loanbalancerecognitionAdd.vue
  12. 8
      anrui-riskcenter-ui/src/views/workFlow/fangkuanquerenFlow/loanbalancerecognitionEdit.vue
  13. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java
  14. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
  15. 64
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
View File

@ -2238,7 +2238,13 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vinItem.getVinSid(), orderSid);
if (null != busSalesOrderVehicle) {
if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
mortagageDto.setVinNo(busSalesOrderVehicle.getLinkNo());
String linkNo = busSalesOrderVehicle.getLinkNo();
if (linkNo.length() > 8) {
String substringLinkNo = linkNo.substring(linkNo.length() - 8);
mortagageDto.setVinNo(substringLinkNo);
} else {
mortagageDto.setVinNo(linkNo);
}
}
if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) {
mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid());

14
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java
View File

@ -100,6 +100,12 @@ public interface FinCompanyInvoicingFeign {
@ResponseBody
ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByTaxpayerNo(@RequestParam("taxpayerNo") String taxpayerNo);
@ApiOperation("根据纳税人识别号以及组织sid查询开票信息")
@GetMapping("/selByTaxpayerNoAndUseOrgSid")
@ResponseBody
ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(@RequestParam("taxpayerNo") String taxpayerNo, @RequestParam("useOrgSid") String useOrgSid);
@ApiOperation("根据组织全路径查询开票信息")
@GetMapping("/selectInvoingByOrgPath")
@ResponseBody
@ -134,7 +140,7 @@ public interface FinCompanyInvoicingFeign {
@ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qySelByUseOrgSid3")
@ResponseBody
List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid,@RequestParam("invoiceKey") String invoiceKey);
List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid, @RequestParam("invoiceKey") String invoiceKey);
@ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qyAppSelByUseOrgSid")
@ -144,7 +150,7 @@ public interface FinCompanyInvoicingFeign {
@ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qyAppSelByUseOrgSidTwo")
@ResponseBody
List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search,@RequestParam(value = "invoiceKey",required = false)String invoiceKey);
List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam(value = "invoiceKey", required = false) String invoiceKey);
@ApiOperation("企业开票信息管理移动端维护初始化")
@GetMapping("/qyAppFetchDetailsBySid/{sid}")
@ -159,10 +165,10 @@ public interface FinCompanyInvoicingFeign {
@ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qySelByUseOrgSid2")
@ResponseBody
List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("invoiceKey") String invoiceKey);
List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("invoiceKey") String invoiceKey);
@ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
@PostMapping("/qyAppSelByUseOrgSid2")
@ResponseBody
List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("search") String search,@RequestParam("invoiceKey") String invoiceKey);
List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam("invoiceKey") String invoiceKey);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java
View File

@ -95,6 +95,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
return null;
}
@Override
public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
return null;
}
@Override
public ResultBean<List<FinCompanyInvoicingDetailsVo>> selectInvoingByOrgPath(String orgPath) {
return null;

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);

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java
View File

@ -83,4 +83,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
@Select("select * from fin_company_invoicing where useOrgSid = #{userOrgSid} and isDelete = 0")
List<FinCompanyInvoicingDetailsVo> selectInvoingByOrgPath(String userOrgSid);
FinCompanyInvoicingDetailsVo selByTaxpayerNoAndUseOrgSid(@Param("taxpayerNo") String taxpayerNo, @Param("useOrgSid") String useOrgSid);
}

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml
View File

@ -97,6 +97,27 @@
where taxpayerNo = #{taxpayerNo}
and isDelete = 0
</select>
<select id="selByTaxpayerNoAndUseOrgSid"
resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo">
select sid,
bankAccount,
bankName,
`name`,
taxpayerNo,
address,
phone,
useOrgSid,
useOrgName,
purchaseSystemSid,
orgSidPath,
createBySid,
invoiceType as openTickTypeValue,
invoiceTypeKey as openTickTypeKey
from fin_company_invoicing
where taxpayerNo = #{taxpayerNo}
and useOrgSid = #{useOrgSid}
and isDelete = 0
</select>
</mapper>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java
View File

@ -122,6 +122,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
return finCompanyInvoicingService.selectInvoingByTaxpayerNo(taxpayerNo);
}
@Override
public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
return finCompanyInvoicingService.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid);
}
@Override
public ResultBean<List<FinCompanyInvoicingDetailsVo>> selectInvoingByOrgPath(String orgPath) {
return finCompanyInvoicingService.selectInvoingByOrgPath(orgPath);

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
View File

@ -557,4 +557,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
return finCompanyInvoicingBillListVos;
}
public ResultBean<FinCompanyInvoicingDetailsVo> selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) {
ResultBean<FinCompanyInvoicingDetailsVo> rb = ResultBean.fireFail();
FinCompanyInvoicingDetailsVo vo = baseMapper.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid);
return rb.success().setData(vo);
}
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json
View File

@ -50,7 +50,7 @@
"FNOTAXAMOUNT": "0",
"FTAXAMOUNT": "0",
"FCancelStatus": "",
"FAR_OtherRemarks": "",
"FAR_OtherRemarks": "@KD_FAR_OtherRemarks",
"FScanPoint": {
"FNUMBER": ""
},

8
anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
View File

@ -25,10 +25,10 @@ image:
url:
prefix: http://anrui.yyundong.com/upload/
kingdee:
acctID: 64ae52afbc9aa4 #登录金蝶的账户信息 202307测试
acctID: 65641dbcf39079 #登录金蝶的账户信息 2023011测试
userName: 信息部 #登录金蝶的账户信息 202302测试的
password: 123321 #登录金蝶的账户信息
userName_administrator: Administrator #登录金蝶的账户信息 202307测试
password_administrator: ANrui123456. #登录金蝶的账户信息 202307测试
password: 123456 #登录金蝶的账户信息
userName_administrator: Administrator #登录金蝶的账户信息 2023011测试
password_administrator: ANrui123456. #登录金蝶的账户信息 2023011测试
lcid: 2052 #登录金蝶的账户信息
url: http://121.36.43.55 #金蝶财务系统ip地址

8
anrui-riskcenter-ui/src/views/loanbalancerecognition/loanbalancerecognitionAdd.vue
View File

@ -150,7 +150,7 @@ export default {
// 计算主产品厂家贴息--差额
realityDiscountInput(row) {
if (row.makeDiscount !== '' && row.realityDiscount !== '' && row.realityDiscount !== null) {
row.diffDiscount = parseFloat(row.makeDiscount) - parseFloat(row.realityDiscount)
row.diffDiscount = (parseFloat(row.makeDiscount) - parseFloat(row.realityDiscount)).toFixed(2)
} else {
row.diffDiscount = ''
}
@ -158,7 +158,7 @@ export default {
// 计算其它融厂家铁屑--差额
realityOtherDiscountInput(row) {
if (row.makeOtherDiscount !== '' && row.realityOtherDiscount !== '' && row.realityOtherDiscount !== null) {
row.diffOtherDiscount = parseFloat(row.makeOtherDiscount) - parseFloat(row.realityOtherDiscount)
row.diffOtherDiscount = (parseFloat(row.makeOtherDiscount) - parseFloat(row.realityOtherDiscount)).toFixed(2)
} else {
row.diffOtherDiscount = ''
}
@ -166,7 +166,7 @@ export default {
// 计算固定保贷款保证金--差额
realityLoanMarginInput(row) {
if (row.makeLoanMargin !== '' && row.realityLoanMargin !== '' && row.realityLoanMargin !== null) {
row.diffLoanMargin = parseFloat(row.makeLoanMargin) - parseFloat(row.realityLoanMargin)
row.diffLoanMargin = (parseFloat(row.makeLoanMargin) - parseFloat(row.realityLoanMargin)).toFixed(2)
} else {
row.diffLoanMargin = ''
}
@ -174,7 +174,7 @@ export default {
// 计算意外险--差额
realityPremiumInput(row) {
if (row.receivedPremium !== '' && row.realityPremium !== '' && row.realityPremium !== null) {
row.diffPremium = parseFloat(row.receivedPremium) - parseFloat(row.realityPremium)
row.diffPremium = (parseFloat(row.receivedPremium) - parseFloat(row.realityPremium)).toFixed(2)
} else {
row.diffPremium = ''
}

8
anrui-riskcenter-ui/src/views/workFlow/fangkuanquerenFlow/loanbalancerecognitionEdit.vue
View File

@ -166,7 +166,7 @@ export default {
// 计算主产品厂家贴息--差额
realityDiscountInput(row) {
if (row.makeDiscount !== '' && row.realityDiscount !== '' && row.realityDiscount !== null) {
row.diffDiscount = parseFloat(row.makeDiscount) - parseFloat(row.realityDiscount)
row.diffDiscount = (parseFloat(row.makeDiscount) - parseFloat(row.realityDiscount)).toFixed(2)
} else {
row.diffDiscount = ''
}
@ -174,7 +174,7 @@ export default {
// 计算其它融厂家铁屑--差额
realityOtherDiscountInput(row) {
if (row.makeOtherDiscount !== '' && row.realityOtherDiscount !== '' && row.realityOtherDiscount !== null) {
row.diffOtherDiscount = parseFloat(row.makeOtherDiscount) - parseFloat(row.realityOtherDiscount)
row.diffOtherDiscount = (parseFloat(row.makeOtherDiscount) - parseFloat(row.realityOtherDiscount)).toFixed(2)
} else {
row.diffOtherDiscount = ''
}
@ -182,7 +182,7 @@ export default {
// 计算固定保贷款保证金--差额
realityLoanMarginInput(row) {
if (row.makeLoanMargin !== '' && row.realityLoanMargin !== '' && row.realityLoanMargin !== null) {
row.diffLoanMargin = parseFloat(row.makeLoanMargin) - parseFloat(row.realityLoanMargin)
row.diffLoanMargin = (parseFloat(row.makeLoanMargin) - parseFloat(row.realityLoanMargin)).toFixed(2)
} else {
row.diffLoanMargin = ''
}
@ -190,7 +190,7 @@ export default {
// 计算意外险--差额
realityPremiumInput(row) {
if (row.receivedPremium !== '' && row.realityPremium !== '' && row.realityPremium !== null) {
row.diffPremium = parseFloat(row.receivedPremium) - parseFloat(row.realityPremium)
row.diffPremium = (parseFloat(row.receivedPremium) - parseFloat(row.realityPremium)).toFixed(2)
} else {
row.diffPremium = ''
}

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java
View File

@ -684,9 +684,11 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
String createBySid = "";
String openTicketType = "";
String openTicketTypeKey = "";
String useOrgSid = "";
if (StringUtils.isNotBlank(entity.getTaxpayerNo())) {
taxpayerNo = entity.getTaxpayerNo();
FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
useOrgSid = entity.getUseOrgSid();
FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid).getData();
if (null != data) {
BeanUtil.copyProperties(data, invoicingDto);
invoicingSid = data.getSid();
@ -748,9 +750,11 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
String createBySid = "";
String openTicketType = "";
String openTicketTypeKey = "";
String useOrgSid = "";
if (StringUtils.isNotBlank(entity.getIdNumber())) {
taxpayerNo = entity.getIdNumber();
FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(taxpayerNo).getData();
useOrgSid = entity.getUseOrgSid();
FinCompanyInvoicingDetailsVo data = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid).getData();
if (null != data) {
BeanUtil.copyProperties(data, invoicingDto);
invoicingSid = data.getSid();

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);
}

64
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
View File

@ -186,9 +186,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
}
// 主产品首期月还
if (null != schedule.getMainFirstRepay()) {
vo.setMainFirstRepay(schedule.getMainFirstRepay().toString());
}
// 主产品期间月还
if (null != schedule.getMainMidRepay()) {
@ -405,6 +403,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();
String vinNo = "";
if (linkNo.length() > 8) {
vinNo = linkNo.substring(linkNo.length() - 8);
} else {
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
//主方案
for (int i = 0; i < mainPeriod; i++) {
@ -428,7 +432,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setUseOrgName(useOrgName);
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(linkNo);
mainDto.setVinNo(vinNo);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("0");
@ -467,7 +471,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
otherDto.setUseOrgName(useOrgName);
otherDto.setOrgSidPath(orgSidPath);
otherDto.setBusVinSid(busVinSid);
otherDto.setVinNo(linkNo);
otherDto.setVinNo(vinNo);
otherDto.setSalesUserSid(staffSid);
otherDto.setStaffName(staffName);
otherDto.setPolicyOrOther("1");
@ -559,6 +563,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();
String vinNo = "";
if (linkNo.length() > 8) {
vinNo = linkNo.substring(linkNo.length() - 8);
} else {
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
//主方案
for (int i = 0; i < mainPeriod; i++) {
@ -582,7 +592,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setUseOrgName(useOrgName);
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(linkNo);
mainDto.setVinNo(vinNo);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("1");
@ -642,7 +652,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (!busSalesOrderVehicles.isEmpty()) {
List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
if (!stringVinNos.isEmpty()) {
entity.setVinNo(String.join(",", stringVinNos));
List<String> vinList = new ArrayList<>();
for (String linkNo : stringVinNos) {
String vinNo = "";
if (linkNo.length() > 8) {
vinNo = linkNo.substring(linkNo.length() - 8);
} else {
vinNo = linkNo;
}
vinList.add(vinNo);
}
entity.setVinNo(String.join(",", vinList));
}
}
BusSalesOrderLoancontractDetailsVo loancontractVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(dto.getSalesOrderSid()).getData();
@ -751,6 +772,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();
String vinNo = "";
if (linkNo.length() > 8) {
vinNo = linkNo.substring(linkNo.length() - 8);
} else {
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
//主方案
for (int i = 0; i < mainPeriod; i++) {
@ -774,7 +801,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setUseOrgName(useOrgName);
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(linkNo);
mainDto.setVinNo(vinNo);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("0");
@ -813,7 +840,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
otherDto.setUseOrgName(useOrgName);
otherDto.setOrgSidPath(orgSidPath);
otherDto.setBusVinSid(busVinSid);
otherDto.setVinNo(linkNo);
otherDto.setVinNo(vinNo);
otherDto.setSalesUserSid(staffSid);
otherDto.setStaffName(staffName);
otherDto.setPolicyOrOther("1");
@ -904,6 +931,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (!vehicles.isEmpty()) {
for (BusSalesOrderVehicle vehicle : vehicles) {
String linkNo = vehicle.getLinkNo();
String vinNo = "";
if (linkNo.length() > 8) {
vinNo = linkNo.substring(linkNo.length() - 8);
} else {
vinNo = linkNo;
}
String busVinSid = vehicle.getSid();
//主方案
for (int i = 0; i < mainPeriod; i++) {
@ -927,7 +960,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
mainDto.setUseOrgName(useOrgName);
mainDto.setOrgSidPath(orgSidPath);
mainDto.setBusVinSid(busVinSid);
mainDto.setVinNo(linkNo);
mainDto.setVinNo(vinNo);
mainDto.setSalesUserSid(staffSid);
mainDto.setStaffName(staffName);
mainDto.setPolicyOrOther("1");
@ -1232,7 +1265,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
if (!busSalesOrderVehicles.isEmpty()) {
List<String> stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList());
if (!stringVinNos.isEmpty()) {
vo.setVinNo(String.join(",", stringVinNos));
List<String> vinList = new ArrayList<>();
for (String linkNo : stringVinNos) {
String vinNo = "";
if (linkNo.length() > 8) {
vinNo = linkNo.substring(linkNo.length() - 8);
} else {
vinNo = linkNo;
}
vinList.add(vinNo);
}
vo.setVinNo(String.join(",", vinList));
}
}
}

Write Preview
Loading…
Cancel
Save