From 38675d111fd7655baf9c69476924fd263b076d9c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 4 Jul 2024 10:21:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B4=B7=E5=90=8E=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 7 +- .../basevehicle/BaseVehicleFeignFallback.java | 7 +- .../biz/basevehicle/BaseVehicleMapper.java | 4 +- .../biz/basevehicle/BaseVehicleMapper.xml | 9 +- .../base/biz/basevehicle/BaseVehicleRest.java | 5 + .../biz/basevehicle/BaseVehicleService.java | 9 +- .../api/bussalesorder/BusSalesOrderFeign.java | 7 +- .../BusSalesOrderFeignFallback.java | 7 +- .../BusSalesOrderBorrowerFeign.java | 6 +- .../BusSalesOrderBorrowerFeignFallback.java | 7 +- .../BusSalesOrderLoancontractFeign.java | 3 + ...usSalesOrderLoancontractFeignFallback.java | 5 + .../BusSalesOrderVehicleFeign.java | 4 + .../BusSalesOrderVehicleFeignFallback.java | 5 + .../bussalesorder/BusSalesOrderMapper.java | 4 +- .../biz/bussalesorder/BusSalesOrderMapper.xml | 11 +- .../biz/bussalesorder/BusSalesOrderRest.java | 54 +- .../bussalesorder/BusSalesOrderService.java | 6 +- .../BusSalesOrderBorrowerMapper.java | 4 +- .../BusSalesOrderBorrowerMapper.xml | 11 +- .../BusSalesOrderBorrowerRest.java | 7 + .../BusSalesOrderBorrowerService.java | 6 +- .../BusSalesOrderLoancontractMapper.java | 2 + .../BusSalesOrderLoancontractMapper.xml | 9 + .../BusSalesOrderLoancontractRest.java | 7 + .../BusSalesOrderLoancontractService.java | 4 + .../BusSalesOrderVehicleMapper.java | 2 + .../BusSalesOrderVehicleMapper.xml | 9 + .../BusSalesOrderVehicleRest.java | 7 + .../BusSalesOrderVehicleService.java | 4 + .../crmcustomertemp/CrmCustomerTempFeign.java | 7 + .../CrmCustomerTempFeignFallback.java | 5 + .../CrmCustomerTempMapper.java | 2 + .../crmcustomertemp/CrmCustomerTempMapper.xml | 9 + .../crmcustomertemp/CrmCustomerTempRest.java | 5 + .../CrmCustomerTempService.java | 6 + ...UncollectedReceivablesDetailedJRFeign.java | 6 +- ...tedReceivablesDetailedJRFeignFallback.java | 7 +- ...ncollectedReceivablesDetailedJRMapper.java | 4 +- ...UncollectedReceivablesDetailedJRMapper.xml | 12 +- ...nUncollectedReceivablesDetailedJRRest.java | 5 + ...collectedReceivablesDetailedJRService.java | 6 +- .../sysorganization/SysOrganizationFeign.java | 13 +- .../SysOrganizationFeignFallback.java | 7 +- .../SysOrganizationMapper.java | 4 +- .../sysorganization/SysOrganizationMapper.xml | 8 +- .../sysorganization/SysOrganizationRest.java | 7 + .../SysOrganizationService.java | 6 +- .../LoanRepaymentSchedule.java | 9 +- .../LoanRepaymentScheduleFeign.java | 12 +- .../LoanRepaymentScheduleFeignFallback.java | 14 +- .../historyData/ImportSleepData.java | 43 + .../historyData/ReturnSleepMsp.java | 19 + .../biz/loanfinbank/LoanFinBankMapper.java | 4 +- .../biz/loanfinbank/LoanFinBankMapper.xml | 8 +- .../biz/loanfinbank/LoanFinBankService.java | 14 +- .../biz/loanfundday/LoanFundDayMapper.java | 2 + .../biz/loanfundday/LoanFundDayMapper.xml | 12 +- .../biz/loanfundday/LoanFundDayService.java | 4 + .../LoanRepaymentHistoryMapper.java | 2 + .../LoanRepaymentHistoryMapper.xml | 12 + .../LoanRepaymentHistoryService.java | 4 + .../LoanRepaymentPlanDetailsMapper.java | 8 + .../LoanRepaymentPlanDetailsMapper.xml | 65 +- .../LoanRepaymentPlanDetailsService.java | 16 + .../LoanRepaymentScheduleMapper.java | 8 + .../LoanRepaymentScheduleMapper.xml | 33 + .../LoanRepaymentScheduleRest.java | 15 +- .../LoanRepaymentScheduleService.java | 1554 ++++++++++++++++- .../asservicegroup/AsServiceGroupListVo.java | 6 + .../anrui/as/api/asservicegroup/MemberVo.java | 18 + .../asservicegroup/AsServiceGroupMapper.java | 2 +- .../asservicegroup/AsServiceGroupMapper.xml | 5 +- .../asservicegroup/AsServiceGroupService.java | 39 +- 74 files changed, 2178 insertions(+), 101 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnSleepMsp.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/MemberVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index d697f5a89f..7db9e97c5f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -387,6 +387,11 @@ public interface BaseVehicleFeign { @GetMapping("/selVehicleByVinNo/{vinNo}") ResultBean selVehicleByVinNo(@PathVariable("vinNo") String vinNo); + + @ApiOperation("根据车架号获取车辆") + @GetMapping("/selOneByVinNo/{vinNo}") + ResultBean selOneByVinNo(@PathVariable("vinNo") String vinNo); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") @@ -538,4 +543,4 @@ public interface BaseVehicleFeign { @PostMapping("/selectVinNo") @ResponseBody ResultBean selectVinNo(String vinNo); -} \ No newline at end of file +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index e9c438fe33..d8ae38a19a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -277,6 +277,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean selOneByVinNo(String vinNo) { + return null; + } + @Override public ResultBean> getAppCurrentCarByPageList(PagerQuery pagerQuery) { return null; @@ -442,4 +447,4 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } -} \ No newline at end of file +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 9c6208cd3a..528a92fb15 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -505,4 +505,6 @@ public interface BaseVehicleMapper extends BaseMapper { void updateStateForReturnVeh(String vehSid); int selectVinNo(String vinNo); -} \ No newline at end of file + + BaseVehicle selOneByVinNo(@Param("substringVinNo") String substringVinNo); +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 17b8d87e15..88af0c7e98 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1804,4 +1804,11 @@ AND isDelete = 0 AND vehicleState != "0004" - \ No newline at end of file + + diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 709536bbba..4879308ffc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -1125,6 +1125,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return baseVehicleService.selVehicleByVinNo(vinNo); } + @Override + public ResultBean selOneByVinNo(String vinNo) { + return baseVehicleService.selOneByVinNo(vinNo); + } + /** * 手机端现车列表 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index f024bffba0..fb25bb4640 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -4412,4 +4412,11 @@ public class BaseVehicleService extends MybatisBaseService selOneByVinNo(String vinNo) { + ResultBean rb = ResultBean.fireFail(); + String substringVinNo = vinNo.substring(vinNo.length() - 8); + BaseVehicle baseVehicle = baseMapper.selOneByVinNo(substringVinNo); + return rb.success().setData(baseVehicle); + } +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 6c3446a3f1..9b734f1a7d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -398,4 +398,9 @@ public interface BusSalesOrderFeign { @PostMapping("/selectByContractNoOne") @ResponseBody ResultBean selectByContractNoOne(@RequestParam("contractNo") String contractNo); -} \ No newline at end of file + + @ApiOperation("批量保存") + @PostMapping("/saveList") + @ResponseBody + void saveList(@RequestBody() List orders); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index db0b3817db..2aa320d2fe 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -371,4 +371,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean selectByContractNoOne(String contractNo) { return null; } -} \ No newline at end of file + + @Override + public void saveList(List orders){ + + }; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java index 8fc8384698..ccd51f2e89 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java @@ -110,4 +110,8 @@ public interface BusSalesOrderBorrowerFeign { @PostMapping("/selectByNum") @ResponseBody ResultBean selectByNum(@RequestParam("saleOrderSid") String saleOrderSid); -} \ No newline at end of file + + @ApiOperation("批量保存") + @PostMapping("/saveList") + ResultBean saveList(@RequestBody List borrowers); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java index a11655472f..d3a6126d7d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java @@ -104,4 +104,9 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower public ResultBean selectByNum(String saleOrderSid) { return null; } -} \ No newline at end of file + + @Override + public ResultBean saveList(List borrowers) { + return null; + } +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index a272a441e4..b18b9f0b1d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -147,4 +147,7 @@ public interface BusSalesOrderLoancontractFeign { @ResponseBody ResultBean pushOtherDocument(@RequestBody PushOtherDocument push); + @ApiOperation("批量保存") + @PostMapping("/saveList") + ResultBean saveList(@RequestBody List contracts); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index fac1719426..5a2eb2c4f4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -141,4 +141,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean pushOtherDocument(PushOtherDocument push) { return null; } + + @Override + public ResultBean saveList(List contracts) { + return null; + } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index b505685860..3f1637848e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -175,4 +175,8 @@ public interface BusSalesOrderVehicleFeign { @ApiOperation("根据订单sid车架号查询") @GetMapping("/selByOrderSidAndVinNo") ResultBean selByOrderSidAndVinNo(@RequestParam("salesOrderSid")String salesOrderSid, @RequestParam("vinNo")String vinNo); + + @ApiOperation("批量保存") + @PostMapping("/saveList") + ResultBean saveList(@RequestBody List vehicles); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index a8c4269d99..34d48c5b4c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -173,4 +173,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean saveList(List vehicles) { + return null; + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 69c7908aaf..a05b710583 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -247,4 +247,6 @@ public interface BusSalesOrderMapper extends BaseMapper { String selectByBusVinSid1(String sid); FinCompanyInvoicing selectByIncovingSid(String companyInvoicingSid); -} \ No newline at end of file + + void saveList(@Param("list") List list); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 825f29cd15..8e5248f599 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -1,6 +1,15 @@ + + insert into bus_sales_order(createBySid,sid,createTime,payType,payTypeKey,financePlan,financePlanValue, + isEnable,customerSid,useOrgSid,useOrgName,orgSid,orgName,orgSidPath) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.payType},#{item.payTypeKey},#{item.financePlan},#{item.financePlanValue}, + #{item.isEnable},#{item.customerSid},#{item.useOrgSid},#{item.useOrgName},#{item.orgSid},#{item.orgName},#{item.orgSidPath}) + + select * from anrui_fin.fin_company_invoicing where sid = #{companyInvoicingSid} - \ No newline at end of file + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index df787cf1ad..0d1273db11 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -51,10 +51,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -152,22 +149,22 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { return rb.success().setMsg("操作成功"); } - /* @Override - public ResultBean submit(SubmitAllOrderDto dto) { - return busSalesOrderService.submit(dto); - } + /* @Override + public ResultBean submit(SubmitAllOrderDto dto) { + return busSalesOrderService.submit(dto); + } - @Override - public ResultBean pcIsSubmit(SubmitAllOrderDto dto) { - return busSalesOrderService.pcIsSubmit(dto); - } -*/ + @Override + public ResultBean pcIsSubmit(SubmitAllOrderDto dto) { + return busSalesOrderService.pcIsSubmit(dto); + } + */ @Override public ResultBean complete(BusSalesOrderFlowQuery query) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); - return busSalesOrderService.complete(bv,true); + return busSalesOrderService.complete(bv, true); } @Override @@ -242,12 +239,12 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { @Override public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException { - return busSalesOrderService.rePublishSaleOrder(saleOrderSid,"","",""); + return busSalesOrderService.rePublishSaleOrder(saleOrderSid, "", "", ""); } @Override public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException { - return busSalesOrderService.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile); + return busSalesOrderService.rePublishSaleOrder(saleOrderSid, customerSid, customerName, customerMobile); } @@ -345,7 +342,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { @Override public ResultBean getVinSidByConSid(String contractNo, String vinNo) { - return busSalesOrderService.getVinSidByConSid(contractNo,vinNo); + return busSalesOrderService.getVinSidByConSid(contractNo, vinNo); } @Override @@ -360,7 +357,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { @Override public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) { - return busSalesOrderService.deleteVirtualDepositList(saleOrderSid, virtualOrderSid,depositRecordSid); + return busSalesOrderService.deleteVirtualDepositList(saleOrderSid, virtualOrderSid, depositRecordSid); } @Override @@ -381,8 +378,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { } @Override - public ResultBean selectTemporaryNo(String vehSid,String contractNo) { - return busSalesOrderService.selectTemporaryNo(vehSid,contractNo); + public ResultBean selectTemporaryNo(String vehSid, String contractNo) { + return busSalesOrderService.selectTemporaryNo(vehSid, contractNo); } @Override @@ -392,17 +389,17 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { @Override public ResultBean createPdf(String sid, String userName) { - return busSalesOrderService.createPdf(sid,userName); + return busSalesOrderService.createPdf(sid, userName); } @Override public ResultBean> selectBusinessSid(String userSid, String orgPath) { - return busSalesOrderService.selectBusinessSid(userSid,orgPath); + return busSalesOrderService.selectBusinessSid(userSid, orgPath); } @Override public ResultBean> selectBusinessSidByQKKP(String userSid, String useOrgSid) { - return busSalesOrderService.selectBusinessSidByQKKP(userSid,useOrgSid); + return busSalesOrderService.selectBusinessSidByQKKP(userSid, useOrgSid); } @Override @@ -436,8 +433,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { } @Override - public ResultBean saveBorrowNum(String sid,List vins) { - return busSalesOrderService.saveBorrowNum(sid,vins); + public ResultBean saveBorrowNum(String sid, List vins) { + return busSalesOrderService.saveBorrowNum(sid, vins); } @Override @@ -447,11 +444,16 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { @Override public ResultBean saveSaleOrderInputLender(String saleOrderSid, String sid) { - return busSalesOrderService.saveSaleOrderInputLender(saleOrderSid,sid); + return busSalesOrderService.saveSaleOrderInputLender(saleOrderSid, sid); } @Override public ResultBean selectByContractNoOne(String contractNo) { return busSalesOrderService.selectByContractNoOne(contractNo); } + + @Override + public void saveList(List orders) { + busSalesOrderService.saveList(orders); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index c722fea52e..4942d685ee 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -8269,4 +8269,8 @@ public class BusSalesOrderService extends MybatisBaseService orders) { + baseMapper.saveList(orders); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java index 60353497d5..090548d0b3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java @@ -102,4 +102,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper list); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml index be744f89e3..0907382515 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml @@ -1,6 +1,15 @@ + + insert into bus_sales_order_borrower(createBySid,sid,createTime,salesOrderSid,customSid,borrowerName,mobile, + isEnable,vehCount,bankSid,bankName,policyName) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.salesOrderSid},#{item.customSid},#{item.borrowerName},#{item.mobile}, + #{item.isEnable},#{item.vehCount},#{item.bankSid},#{item.bankName},#{item.policyName}) + + - \ No newline at end of file + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java index a2c15eaa9c..ab183ed049 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java @@ -131,4 +131,11 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign { int num = busSalesOrderBorrowerService.selectByNum(saleOrderSid); return rb.success().setData(num); } + + @Override + public ResultBean saveList(List borrowers) { + ResultBean rb = ResultBean.fireFail(); + int i = busSalesOrderBorrowerService.saveList(borrowers); + return rb.success(); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java index cee856d5dc..4999d706d0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java @@ -329,4 +329,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService borrowers) { + return baseMapper.saveList(borrowers); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java index 9ef7187a01..f84ed7e282 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java @@ -96,4 +96,6 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper selLoancontractsForExport(@Param(Constants.WRAPPER) QueryWrapper qw); + + int saveList(@Param("list") List list); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml index e4a1a6a2e7..d078fb754c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml @@ -1,6 +1,15 @@ + + insert into bus_sales_order_loancontract(createBySid,sid,createTime,salesOrderSid,loanContractNo,bankContractNo,bankName, + isEnable,policyName,borrowerSid,borrowerName,vehCount) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.salesOrderSid},#{item.loanContractNo},#{item.bankContractNo},#{item.bankName}, + #{item.isEnable},#{item.policyName},#{item.borrowerSid},#{item.borrowerName},#{item.vehCount}) + + diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 42fb3857c5..03ea733774 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -133,6 +133,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.saveCrmCustomer(dto); } + @Override + public ResultBean saveList(List customerTemps) { + return crmCustomerTempService.saveList(customerTemps); + } + @Override public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) { return crmCustomerTempService.billApplicatSaveCust(dto); diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 9d28cadb87..4da467a42b 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -1445,4 +1445,10 @@ public class CrmCustomerTempService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean saveList(List customerTemps) { + ResultBean rb = ResultBean.fireFail(); + int i = baseMapper.saveList(customerTemps); + return rb.success(); + } } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java index fd5ac2b3d5..08b960db58 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java @@ -76,4 +76,8 @@ public interface FinUncollectedReceivablesDetailedJRFeign { @PostMapping("/saveAll") public ResultBean saveAll(List list); -} \ No newline at end of file + @ApiOperation("导入数据批量添加") + @PostMapping("/saveList") + @ResponseBody + void saveList(@RequestBody List jrList); +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java index d4d35c21cb..1d556206ff 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java @@ -70,4 +70,9 @@ public class FinUncollectedReceivablesDetailedJRFeignFallback implements FinUnco public ResultBean saveAll(List list) { return null; } -} \ No newline at end of file + + @Override + public void saveList(List jrList) { + + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java index 5ca233cc3f..4fe5b2bec2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.java @@ -89,4 +89,6 @@ public interface FinUncollectedReceivablesDetailedJRMapper extends BaseMapper list); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml index 4727f77f39..54db4308d7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml @@ -1,6 +1,16 @@ + + insert into + fin_uncollected_receivables_detailed_jr(createBySid,sid,createTime,isEnable, + kxState,reveivableMoney,currentReceivableMoney,busSid,payCostTitleKey,payCostTitleValue) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.kxState},#{item.reveivableMoney},#{item.currentReceivableMoney}, + #{item.busSid},#{item.payCostTitleKey},#{item.payCostTitleValue}) + + @@ -367,4 +377,4 @@ resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails"> select * from anrui_riskcenter.loan_repayment_plan_details where sid = #{sid} - \ No newline at end of file + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRRest.java index 6d4a5b8333..0741874237 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRRest.java @@ -83,4 +83,9 @@ public class FinUncollectedReceivablesDetailedJRRest implements FinUncollectedRe public ResultBean saveAll(List list) { return finUncollectedReceivablesDetailedJRService.saveAll(list); } + + @Override + public void saveList(List jrList) { + finUncollectedReceivablesDetailedJRService.saveList(jrList); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java index 43fd920be6..db3c88278c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java @@ -173,4 +173,8 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi } return rb.success(); } -} \ No newline at end of file + + public void saveList(List jrList) { + baseMapper.saveList(jrList); + } +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index d410e03ea1..d053f64966 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -103,12 +103,12 @@ public interface SysOrganizationFeign { @ApiOperation("获取指定品牌下分公司(已筛选本分公司)") @ResponseBody @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}") - ResultBean> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid); + ResultBean> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid, @PathVariable(value = "brandSid") String brandSid); @ApiOperation("获取指定品牌下分公司(未筛选本分公司)") @ResponseBody @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}") - ResultBean> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid); + ResultBean> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid, @PathVariable(value = "brandSid") String brandSid); @ApiOperation("获取指定分公司下部门信息") @ResponseBody @@ -193,10 +193,15 @@ public interface SysOrganizationFeign { @GetMapping("/selectFinance") @ResponseBody @ApiOperation("查询金融部主管人员") - ResultBean> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid); + ResultBean> selectFinance(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); @GetMapping("/selectByCJOrgPath") @ResponseBody @ApiOperation("根据管理层级截取路径") ResultBean selectByCJOrgPath(@RequestParam("orgPath") String orgPath); -} \ No newline at end of file + + @GetMapping("/selectByOrgCodeAndPsid") + @ResponseBody + @ApiOperation("根据code查询组织信息") + ResultBean selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid); +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 41fd3e4281..fa3d1c82f9 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -201,4 +201,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean selectByCJOrgPath(String orgPath) { return null; } -} \ No newline at end of file + + @Override + public ResultBean selectByOrgCodeAndPsid(String orgCode, String pSid) { + return null; + } +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 056664224e..1b95a4f072 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -128,4 +128,6 @@ public interface SysOrganizationMapper extends BaseMapper { List selectBy(@Param("name") String name, @Param("useOrgSid") String useOrgSid); List selectByOrgDeptSid2(String orgDeptSid); -} \ No newline at end of file + + SysOrganization selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid); +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 8a1ff7d1d6..f865a63a38 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -243,4 +243,10 @@ - \ No newline at end of file + + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index cd6f36fc7f..7156bae3d0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -466,4 +466,11 @@ public class SysOrganizationRest implements SysOrganizationFeign { public ResultBean selectByCJOrgPath(String orgPath) { return sysOrganizationService.selectByCJOrgPath(orgPath); } + + @Override + public ResultBean selectByOrgCodeAndPsid(String orgCode, String pSid) { + ResultBean rb = ResultBean.fireFail(); + SysOrganization sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid); + return rb.success().setData(sysOrganization); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 0ac91956b2..ebc7cb0946 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -715,4 +715,8 @@ public class SysOrganizationService extends MybatisBaseService loanCreateSchedule(String salesOrderSid) { return null; @@ -74,7 +76,17 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule } @Override - public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) throws IOException { + public ResultBean importHistoryData(MultipartFile file, String userSid,HttpServletRequest request) throws IOException { + return null; + } + + @Override + public ResultBean importSleepData(MultipartFile file, String userSid, HttpServletRequest request) throws IOException { + return null; + } + + @Override + public ResultBean importSleepHistoryData(String userSid) { return null; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java new file mode 100644 index 0000000000..2a8f7bd3dc --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/4 8:32 + */ +@Data +public class ImportSleepData { + + @ApiModelProperty("资方合同号") + private String bankContractNo; + @ApiModelProperty("借款人") + private String borrowerName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("应还日期") + private String dueDate; + @ApiModelProperty("应还月还") + private String dueMoney; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("主表sid") + private String scheduleSid; + @ApiModelProperty("主产品/其他融（0/1）") + private String policyOrOther; + + private String deptSid; + private String dept; + private String useOrgSid; + private String orgSidPath; + private String borrowerSid; + private String busVinSid; + private String loanContractSid; + private String loanContractNo; + private String bankName; + private String salesOrderSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnSleepMsp.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnSleepMsp.java new file mode 100644 index 0000000000..0cc26e1bec --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnSleepMsp.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData; + +import lombok.Data; + +import java.util.List; +import java.util.Set; + +/** + * @author Fan + * @description + * @date 2024/7/4 8:32 + */ +@Data +public class ReturnSleepMsp { + + private Set setMsg; + private List list; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java index 1d9694ca15..121c3431fb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.java @@ -92,4 +92,6 @@ public interface LoanFinBankMapper extends BaseMapper { LoanFinBank reAdvancesByOrderSid(@Param("orderSid") String orderSid); LoanFinBank selBankByOrderSid(@Param("orderSid") String salesOrderSid); -} \ No newline at end of file + + LoanFinBank selectFinBankByName(@Param("bankName") String bankName); +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml index 4a15373a6b..4a412cd058 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankMapper.xml @@ -96,4 +96,10 @@ WHERE s.salesOrderSid = #{orderSid} AND s.isDelete = '0' - \ No newline at end of file + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java index 0aac9fb7f1..b38ab08fda 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java @@ -195,6 +195,18 @@ public class LoanFinBankService extends MybatisBaseService { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List fundDayExport(@Param(Constants.WRAPPER) QueryWrapper qw); + + void saveList(@Param("list") List list); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml index 16ff81e0ec..ad294fcd6b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayMapper.xml @@ -1,6 +1,16 @@ + + insert into + loan_fund_day(createBySid,sid,createTime,isEnable, + createDate,paymentMoney,fund,busSid) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.createDate},#{item.paymentMoney},#{item.fund}, + #{item.busSid}) + + - \ No newline at end of file + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java index ea1076b563..df0ac54c0e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/LoanFundDayService.java @@ -197,4 +197,8 @@ public class LoanFundDayService extends MybatisBaseService loanFundDays) { + baseMapper.saveList(loanFundDays); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java index 7e95706355..b9c8bb76ee 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java @@ -81,4 +81,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper transferedPaymentExcel(@Param(Constants.WRAPPER)QueryWrapper qw); List selUpdateTimeByBankName(@Param("histories") List histories); + + void saveList(@Param("list") List list); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 25636d4d3e..6b1c8aa18b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -1,6 +1,18 @@ + + insert into + loan_repayment_history(createBySid,sid,createTime,isEnable, + dataTime,updateState,updateTime, + actualDate,actualMoney,buckleKey,buckle,returnWayKey,returnWay,payState,scheduleSid,planDetailSid) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.dataTime},#{item.updateState},#{item.updateTime}, + #{item.actualDate},#{item.actualMoney},#{item.buckleKey},#{item.buckle},#{item.returnWayKey},#{item.returnWay}, + #{item.payState},#{item.scheduleSid},#{item.planDetailSid}) + + update loan_repayment_plan_details set updateTime = #{formatDate} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index f83ef467a2..d7193931fc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -2186,4 +2186,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService histories) { + baseMapper.saveList(histories); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index 83f70fde37..f5bdaa79df 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -86,4 +86,12 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper selByMainSid(String sid); + + List selByMainSidAndPolicyOrOther(@Param("sid") String sid, @Param("s") String s); + + void updateImportDataList(@Param("list") List list); + + void saveList(@Param("list") List list); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index 764095396d..6f99f3fbe2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -1,6 +1,19 @@ + + insert into + loan_repayment_plan_details(createBySid,sid,createTime,isEnable,salesOrderSid,loanContractSid,loanContractNo, + policyName,bankContractNo,customer,customerSid,borrowerSid,borrowerName,`period`,scheduleSid,bankName,deptSid,dept,useOrgSid,useOrgName, + orgSidPath,busVinSid,vinNo,vehMark,policyOrOther,dueMoney,dueDate,updateTime) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.loanContractSid},#{item.loanContractNo}, + #{item.policyName},#{item.bankContractNo},#{item.customer},#{item.customerSid},#{item.borrowerSid},#{item.borrowerName}, + #{item.period},#{item.scheduleSid},#{item.bankName},#{item.deptSid},#{item.dept},#{item.useOrgSid},#{item.useOrgName},#{item.orgSidPath}, + #{item.busVinSid},#{item.vinNo},#{item.vehMark},#{item.policyOrOther},#{item.dueMoney},#{item.dueDate},#{item.updateTime}) + + UPDATE loan_repayment_plan_details SET updateTime = #{updateTime} @@ -77,7 +90,7 @@ lrpd.customer, lrpd.borrowerName, ( - lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) + lrpd.`dueMoney` - SUM (IFNULL(lrh.actualMoney, 0)) ) AS notRepaidMoney FROM `loan_repayment_plan_details` lrpd @@ -533,6 +546,37 @@ WHERE sid = #{sid} AND period = #{period} + + update loan_repayment_plan_details + + + + + when id=#{item.id} then #{item.paymentMoney} + + + + + + + when id=#{item.id} then #{item.paymentInterest} + + + + + + + when id=#{item.id} then #{item.overdue} + + + + + where id in + + #{item.id} + + - SELECT IFNULL(SUM(dueMoney),0) FROM loan_repayment_plan_details WHERE scheduleSid = #{sid} + SELECT IFNULL(SUM(dueMoney), 0) + FROM loan_repayment_plan_details + WHERE scheduleSid = #{sid} + + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index fcd86cc847..7578a91cea 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -331,4 +331,20 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } + + public List selByMainSidAndPolicyOrOther(String sid, String s) { + return baseMapper.selByMainSidAndPolicyOrOther(sid,s); + } + + public void updateImportDataList(List planDetails) { + baseMapper.updateImportDataList(planDetails); + } + + public void saveList(List planDetails) { + baseMapper.saveList(planDetails); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.java index a62185f4c9..d354339911 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.java @@ -46,4 +46,12 @@ public interface LoanRepaymentScheduleMapper extends BaseMapper selPlansExcel(@Param("sids") List sids); List selMoneyAndVin(@Param("sid") String sid); + + int saveList(@Param("list") List list); + + LoanRepaymentSchedule selByBankContractNoForSleepData(@Param("bankContractNo") String bankContractNo,@Param("vinNo") String vinNo); + + LoanRepaymentSchedule selByOtherBankContractNoForSleepData(@Param("bankContractNo") String bankContractNo,@Param("vinNo") String vinNo); + + int updateIsEnable(@Param("list") List list); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml index 66a2c4d68a..f35a6981cf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml @@ -1,6 +1,31 @@ + + insert into loan_repayment_schedule(createBySid,sid,createTime,isEnable,salesOrderSid,borrowerSid,borrowerName, + vehCount,vinNo,loanContractSid,loanContractNo,bankContractNo,bankName,policyName,mainPeriod,mainRepayDate, + mainLastDate,mainFirstRepay,mainMidRepay,mainLastRepay,otherPeriod,otherBankNo,otherRepayDate,otherFirstRepay, + otherMidRepay,otherLastRepay,isOtherPolicy,sameBank,cwDeptNo,isDifferent,importTiredMoney,importPaymentMoney, + importInterest,importFund) + values + + (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.borrowerSid},#{item.borrowerName}, + #{item.vehCount},#{item.vinNo},#{item.loanContractSid},#{item.loanContractNo},#{item.bankContractNo},#{item.bankName}, + #{item.policyName},#{item.mainPeriod},#{item.mainRepayDate},#{item.mainLastDate},#{item.mainFirstRepay},#{item.mainMidRepay}, + #{item.mainLastRepay},#{item.otherPeriod},#{item.otherBankNo},#{item.otherRepayDate},#{item.otherFirstRepay},#{item.otherMidRepay}, + #{item.otherLastRepay},#{item.isOtherPolicy},#{item.sameBank},#{item.cwDeptNo},#{item.isDifferent},#{item.importTiredMoney}, + #{item.importPaymentMoney},#{item.importInterest},#{item.importFund} + ) + + + + update loan_repayment_schedule + set isEnable = 3 + where sid in + + #{item} + + + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java index 6aa45f3c2f..52519a25c8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java @@ -35,6 +35,7 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign { @Autowired private LoanRepaymentScheduleService loanRepaymentScheduleService; + @Override public ResultBean loanCreateSchedule(String salesOrderSid) { return loanRepaymentScheduleService.loanCreateSchedule(salesOrderSid); @@ -89,8 +90,18 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign { } @Override - public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) throws IOException { - return loanRepaymentScheduleService.importHistoryData(file,request); + public ResultBean importHistoryData(MultipartFile file,String userSid, HttpServletRequest request) throws IOException { + return loanRepaymentScheduleService.importHistoryData(file,userSid,request); + } + + @Override + public ResultBean importSleepData(MultipartFile file, String userSid, HttpServletRequest request) throws IOException { + return loanRepaymentScheduleService.importSleepData(file,userSid,request); + } + + @Override + public ResultBean importSleepHistoryData(String userSid) { + return loanRepaymentScheduleService.importSleepHistoryData(userSid); } @Override diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index e48176a07f..4257cca7b6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; @@ -21,6 +23,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; @@ -40,7 +43,9 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDe import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.HistoryDataImportVo; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ImportSleepData; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ReturnMsg; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ReturnSleepMsp; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; @@ -48,6 +53,8 @@ import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformatio import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService; import com.yxt.anrui.riskcenter.biz.loanfinotherPolicy.LoanFinOtherPolicyService; import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService; +import com.yxt.anrui.riskcenter.biz.loanfundday.LoanFundDayService; +import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService; import com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyService; @@ -64,13 +71,16 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.PushMessageQuery; import com.yxt.messagecenter.api.message.PushSmsDto; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.tomcat.util.threads.ThreadPoolExecutor; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -97,6 +107,7 @@ import java.util.stream.Collectors; * @date: 2023/8/21 **/ @Service + public class LoanRepaymentScheduleService extends MybatisBaseService { @Autowired @@ -139,6 +150,14 @@ public class LoanRepaymentScheduleService extends MybatisBaseService saveHistoryRecord(List list) { + public List saveHistoryRecord(List list, String userSid) throws ParseException { List schedules = new ArrayList<>(); //还款计划表主表 - List planDetails = new ArrayList<>();//还款计划表明细 - List histories = new ArrayList<>();//还款记录 List customerTemps = new ArrayList<>();//客户表 List orders = new ArrayList<>();//销售订单 List vehicles = new ArrayList<>();//销售订单车辆 List borrowers = new ArrayList<>();//贷款人 List contracts = new ArrayList<>();//消贷合同 - List jrList = new ArrayList<>();//金融应收 - List loanFundDays = new ArrayList<>();//资金占用费生成记录 + List planDetails = new ArrayList<>();//还款计划表明细 + List returnList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); for (HistoryDataImportVo v : list) { + String Q = ""; + if (StringUtils.isNotBlank(v.getTiredMoney())) { + Q = v.getTiredMoney(); //累欠本金 + } else { + Q = "0"; + } + String T = ""; + if (StringUtils.isNotBlank(v.getPaymentMoney())) { + T = v.getPaymentMoney(); //其中公司垫还资方金额 + } else { + T = "0"; + } + String L = ""; + if (StringUtils.isNotBlank(v.getInterest())) { + L = v.getInterest(); //垫资方逾期利息 + } else { + L = "0"; + } + String B = ""; + if (StringUtils.isNotBlank(v.getFund())) { + B = v.getFund(); //资金占用费 + } else { + B = "0"; + } + String sleep = v.getSleep(); //是否休眠 String isOther = "0";//是否有其他融 1是0否 String sameBank = "0";//是否资方一致 1是0否 String customerNo = ""; //客户编码 @@ -4917,9 +4960,24 @@ public class LoanRepaymentScheduleService extends MybatisBaseService busSalesOrderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid,vinNo); + ResultBean busSalesOrderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid, vinNo); BusSalesOrderVehicle vehicleData = busSalesOrderVehicle.getData(); if (vehicleData != null) { busVinSid = vehicleData.getSid(); @@ -5005,18 +5101,331 @@ public class LoanRepaymentScheduleService extends MybatisBaseService mainDays = returnRepayDate(mDay, mPeriod); + List otherDays = new ArrayList<>(); + if (isOther.equals("1")) { + otherDays = returnRepayDate(oDay, oPeriod); + } + String vehMark = ""; + LoanWarrantInformation loanWarrantInformation = loanWarrantInformationService.fetchByBusVinSid(busVinSid); + if (null != loanWarrantInformation) { + if (StringUtils.isNotBlank(loanWarrantInformation.getVehicleMark())) { + vehMark = loanWarrantInformation.getVehicleMark(); + } + } + //主方案 + for (int i = 0; i < mainPeriod; i++) { + LoanRepaymentPlanDetails mainDto = new LoanRepaymentPlanDetails(); + mainDto.setCreateBySid(userSid); + mainDto.setSalesOrderSid(salesOrderSid); + mainDto.setLoanContractNo(loanContractNo); + mainDto.setLoanContractSid(loanContractSid); + mainDto.setPolicyName(policyName); + mainDto.setBankContractNo(bankContractNo); + mainDto.setCustomer(customerName); + mainDto.setCustomerSid(customerSid); + mainDto.setBorrowerSid(borrowerSid); + mainDto.setBorrowerName(borrowerCustomerName); + mainDto.setPeriod(String.valueOf(i + 1)); + mainDto.setScheduleSid(scheduleSid); + mainDto.setBankName(bankName); + mainDto.setDept(deptName); + mainDto.setDeptSid(deptSid); + mainDto.setUseOrgSid(useOrgSid); + mainDto.setUseOrgName(useOrgName); + mainDto.setOrgSidPath(orgPath); + mainDto.setBusVinSid(busVinSid); + mainDto.setVinNo(substringVin); + mainDto.setVehMark(vehMark); + mainDto.setPolicyOrOther("0"); + if (i == 0) { + mainDto.setDueMoney(new BigDecimal(mF)); + } else if (i == mainPeriod - 1) { + mainDto.setDueMoney(new BigDecimal(mL)); + } else { + mainDto.setDueMoney(new BigDecimal(mM)); + } + if (!mainDays.isEmpty()) { + mainDto.setDueDate(sdf.parse(mainDays.get(i))); + } + mainDto.setUpdateTime(new Date()); + planDetails.add(mainDto); + } + //其他融 + if (scheduleDetails.getIsOtherPolicy().equals("1")) { + for (int i = 0; i < Integer.parseInt(oPeriod); i++) { + LoanRepaymentPlanDetails otherDto = new LoanRepaymentPlanDetails(); + otherDto.setCreateBySid(userSid); + otherDto.setSalesOrderSid(salesOrderSid); + otherDto.setLoanContractNo(loanContractNo); + otherDto.setLoanContractSid(loanContractSid); + otherDto.setPolicyName(""); + otherDto.setBankName(otherName); + otherDto.setBankContractNo(otherBankNo); + otherDto.setCustomer(customerName); + otherDto.setCustomerSid(customerSid); + otherDto.setBorrowerSid(borrowerSid); + otherDto.setBorrowerName(borrowerCustomerName); + otherDto.setPeriod(String.valueOf(i + 1)); + otherDto.setScheduleSid(scheduleSid); + otherDto.setDept(deptName); + otherDto.setDeptSid(deptSid); + otherDto.setUseOrgSid(useOrgSid); + otherDto.setUseOrgName(useOrgName); + otherDto.setOrgSidPath(orgPath); + otherDto.setBusVinSid(busVinSid); + otherDto.setVinNo(substringVin); + otherDto.setVehMark(vehMark); + otherDto.setPolicyOrOther("1"); + if (i == 0) { + otherDto.setDueMoney(new BigDecimal(oF)); + } else if (i == Integer.parseInt(oPeriod) - 1) { + otherDto.setDueMoney(new BigDecimal(oL)); + } else { + otherDto.setDueMoney(new BigDecimal(oM)); + } + if (!otherDays.isEmpty()) { + otherDto.setDueDate(sdf.parse(otherDays.get(i))); + } + otherDto.setUpdateTime(new Date()); + planDetails.add(otherDto); + } + } - - + } + if (scheduleDetails.getSameBank().equals("1")) { + int mainPeriod = Integer.parseInt(mPeriod); + List mainDays = returnRepayDate(mDay, mPeriod); + String vehMark = ""; + LoanWarrantInformation loanWarrantInformation = loanWarrantInformationService.fetchByBusVinSid(busVinSid); + if (null != loanWarrantInformation) { + if (StringUtils.isNotBlank(loanWarrantInformation.getVehicleMark())) { + vehMark = loanWarrantInformation.getVehicleMark(); + } + } + //主方案 + for (int i = 0; i < mainPeriod; i++) { + LoanRepaymentPlanDetails mainDto = new LoanRepaymentPlanDetails(); + mainDto.setCreateBySid(userSid); + mainDto.setSalesOrderSid(salesOrderSid); + mainDto.setLoanContractNo(loanContractNo); + mainDto.setLoanContractSid(loanContractSid); + mainDto.setPolicyName(policyName); + mainDto.setBankContractNo(bankContractNo); + mainDto.setCustomer(customerName); + mainDto.setCustomerSid(customerSid); + mainDto.setBorrowerSid(borrowerSid); + mainDto.setBorrowerName(borrowerCustomerName); + mainDto.setPeriod(String.valueOf(i + 1)); + mainDto.setScheduleSid(scheduleSid); + mainDto.setBankName(bankName); + mainDto.setDept(deptName); + mainDto.setDeptSid(deptSid); + mainDto.setUseOrgSid(useOrgSid); + mainDto.setUseOrgName(useOrgName); + mainDto.setOrgSidPath(orgPath); + mainDto.setBusVinSid(busVinSid); + mainDto.setVinNo(substringVin); + mainDto.setVehMark(vehMark); + mainDto.setPolicyOrOther("1"); + BigDecimal otherRepay = new BigDecimal(0); + if (i == 0) { + otherRepay = new BigDecimal(oF); + } else if (i == Integer.parseInt(oPeriod) - 1) { + otherRepay = new BigDecimal(oL); + } else if (i > 0 && i < Integer.parseInt(oPeriod) - 1) { + otherRepay = new BigDecimal(oM); + } + if (i == 0) { + BigDecimal mainF = new BigDecimal(mF); + BigDecimal add = mainF.add(otherRepay); + mainDto.setDueMoney(add); + } else if (i == mainPeriod - 1) { + BigDecimal mainL = new BigDecimal(mL); + BigDecimal add = mainL.add(otherRepay); + mainDto.setDueMoney(add); + } else { + BigDecimal mainM = new BigDecimal(mM); + BigDecimal add = mainM.add(otherRepay); + mainDto.setDueMoney(add); + } + if (!mainDays.isEmpty()) { + mainDto.setDueDate(sdf.parse(mainDays.get(i))); + } + mainDto.setUpdateTime(new Date()); + planDetails.add(mainDto); + } + } + } else if (sleep.equals("是")) { + LoanRepaymentSchedule schedule = new LoanRepaymentSchedule(); + schedule.setCreateBySid(userSid); + schedule.setIsOtherPolicy(isOther); + schedule.setSameBank(sameBank); + schedule.setIsDifferent("0"); + schedule.setSalesOrderSid(salesOrderSid); + schedule.setBorrowerSid(borrowerSid); + schedule.setBorrowerName(borrowerCustomerName); + schedule.setVehCount("1"); + schedule.setVinNo(substringVin); + schedule.setLoanContractSid(loanContractSid); + schedule.setLoanContractNo(loanContractNo); + schedule.setBankContractNo(bankContractNo); + schedule.setBankName(bankName); + schedule.setPolicyName(policyName); + schedule.setMainPeriod(mPeriod); + schedule.setMainRepayDate(sdf.parse(mDay)); + schedule.setMainFirstRepay(new BigDecimal(mF)); + schedule.setMainMidRepay(new BigDecimal(mM)); + schedule.setMainLastRepay(new BigDecimal(mL)); + if (isOther.equals("1")) { + schedule.setOtherPeriod(oPeriod); + schedule.setOtherBankNo(otherBankNo); + schedule.setOtherRepayDate(sdf.parse(oDay)); + schedule.setOtherFirstRepay(new BigDecimal(oF)); + schedule.setOtherMidRepay(new BigDecimal(oM)); + schedule.setOtherLastRepay(new BigDecimal(oL)); + } + schedule.setImportTiredMoney(new BigDecimal(Q)); + schedule.setImportPaymentMoney(new BigDecimal(T)); + schedule.setImportInterest(new BigDecimal(L)); + schedule.setImportFund(new BigDecimal(B)); + schedule.setCwDeptNo(salesDeptNo); + schedule.setIsEnable(2); + schedules.add(schedule); } } - - return planDetails; + //批量插入数据 + if (schedules.size() > 0 && !schedules.isEmpty()) { + baseMapper.saveList(schedules); + } + if (planDetails.size() > 0 && !planDetails.isEmpty()) { + loanRepaymentPlanDetailsService.saveList(planDetails); + } + if (customerTemps.size() > 0 && !customerTemps.isEmpty()) { + crmCustomerTempFeign.saveList(customerTemps); + } + if (orders.size() > 0 && !orders.isEmpty()) { + busSalesOrderFeign.saveList(orders); + } + if (contracts.size() > 0 && !contracts.isEmpty()) { + busSalesOrderLoancontractFeign.saveList(contracts); + } + if (vehicles.size() > 0 && !vehicles.isEmpty()) { + busSalesOrderVehicleFeign.saveList(vehicles); + } + if (borrowers.size() > 0 && !borrowers.isEmpty()) { + busSalesOrderBorrowerFeign.saveList(borrowers); + } + return returnList; } - public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request) { + public ResultBean importHistoryData(MultipartFile file, String userSid, HttpServletRequest request) { ResultBean rb = ResultBean.fireFail(); try { String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录 @@ -5043,6 +5452,24 @@ public class LoanRepaymentScheduleService extends MybatisBaseService setMsg = returnMsg.getSetMsg(); StringBuffer sbMsg = new StringBuffer(); + List list = returnMsg.getList(); + if (!list.isEmpty() && list.size() > 0) { + for (HistoryDataImportVo vo : list) { + String bankContractNo = vo.getBankContractNo(); + String linkNo = vo.getVinNo(); + String vinNo = ""; + if (linkNo.length() > 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + + } else { + vinNo = linkNo; + } + LoanRepaymentSchedule schedule = baseMapper.selByBankContractNoForSleepData(bankContractNo, vinNo); + if (null != schedule) { + setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "已存在导入数据，请勿重复导入"); + } + } + } if (null != setMsg && setMsg.size() > 0) { for (String s : setMsg) { sbMsg.append(s).append("，"); @@ -5052,20 +5479,1028 @@ public class LoanRepaymentScheduleService extends MybatisBaseService schedules = saveHistoryRecord(list, userSid); + generateHistoryData(schedules, userSid); } catch (Exception e) { e.printStackTrace(); } return rb.success(); } + + public ResultBean importSleepData(MultipartFile file, String userSid, HttpServletRequest request) { + ResultBean rb = ResultBean.fireFail(); + int size = 0; + try { + String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录 + File tempFile = new File(temp); + if (!tempFile.exists()) { + tempFile.mkdirs(); + } + String fileName = file.getOriginalFilename(); + if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) { + return rb.fail().setMsg("上传文件不正确"); + } + boolean isExcel2003 = true; + if (fileName.matches("^.+\\.(?i)(xlsx)$")) { + isExcel2003 = false; + } + InputStream is = file.getInputStream(); + Workbook wb = null; + if (isExcel2003) { + wb = new HSSFWorkbook(is); + } else { + wb = new XSSFWorkbook(is); + } + Sheet sheet = wb.getSheetAt(0); + ReturnSleepMsp returnMsg = getSleepSheetVal(sheet); + Set setMsg = returnMsg.getSetMsg(); + StringBuffer sbMsg = new StringBuffer(); + List list = returnMsg.getList(); + if (!list.isEmpty() && list.size() > 0) { + for (ImportSleepData importSleepData : list) { + String bankContractNo = importSleepData.getBankContractNo(); + String linkNo = importSleepData.getVinNo(); + String vinNo = ""; + if (linkNo.length() > 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + + } else { + vinNo = linkNo; + } + LoanRepaymentSchedule mainSchedule = baseMapper.selByBankContractNoForSleepData(bankContractNo, vinNo); + if (null != mainSchedule) { + List p = loanRepaymentPlanDetailsService.selByMainSid(mainSchedule.getSid()); + if (!p.isEmpty() && p.size() > 0) { + setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "已存在还款计划明细数据，请勿重复导入"); + } + boolean isOther = false; + String isOtherPolicy = mainSchedule.getIsOtherPolicy(); + String sameBank = mainSchedule.getSameBank(); + importSleepData.setScheduleSid(mainSchedule.getSid()); + if (isOtherPolicy.equals("0")) { + isOther = true; + } else if (isOtherPolicy.equals("1")) { + if (sameBank.equals("1")) { + isOther = true; + } + } + if (isOther) { + importSleepData.setPolicyOrOther("0"); + } else { + importSleepData.setPolicyOrOther("1"); + } + String salesOrderSid = mainSchedule.getSalesOrderSid(); + BusSalesOrder order = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); + if (null != order) { + if (StringUtils.isNotBlank(order.getOrgSid())) { + importSleepData.setDeptSid(order.getOrgSid()); + } + if (StringUtils.isNotBlank(order.getOrgName())) { + importSleepData.setDept(order.getOrgName()); + } + if (StringUtils.isNotBlank(order.getUseOrgSid())) { + importSleepData.setUseOrgSid(order.getUseOrgSid()); + } + if (StringUtils.isNotBlank(order.getOrgSidPath())) { + importSleepData.setOrgSidPath(order.getOrgSidPath()); + } + } + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid, vinNo).getData(); + if (null != orderVehicle) { + importSleepData.setBusVinSid(orderVehicle.getSid()); + } + if (StringUtils.isNotBlank(mainSchedule.getLoanContractSid())) { + importSleepData.setLoanContractSid(mainSchedule.getLoanContractSid()); + } + if (StringUtils.isNotBlank(mainSchedule.getLoanContractNo())) { + importSleepData.setLoanContractNo(mainSchedule.getLoanContractNo()); + } + if (StringUtils.isNotBlank(mainSchedule.getBorrowerSid())) { + importSleepData.setBorrowerSid(mainSchedule.getBorrowerSid()); + } + if (StringUtils.isNotBlank(mainSchedule.getBankContractNo())) { + importSleepData.setBankContractNo(mainSchedule.getBankContractNo()); + } + } else { + LoanRepaymentSchedule otherSchedule = baseMapper.selByOtherBankContractNoForSleepData(bankContractNo, vinNo); + if (null != otherSchedule) { + List p = loanRepaymentPlanDetailsService.selByMainSid(otherSchedule.getSid()); + if (!p.isEmpty() && p.size() > 0) { + setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "已存在还款计划明细数据，请勿重复导入"); + } + String salesOrderSid = otherSchedule.getSalesOrderSid(); + BusSalesOrder order = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); + if (null != order) { + if (StringUtils.isNotBlank(order.getOrgSid())) { + importSleepData.setDeptSid(order.getOrgSid()); + } + if (StringUtils.isNotBlank(order.getOrgName())) { + importSleepData.setDept(order.getOrgName()); + } + if (StringUtils.isNotBlank(order.getUseOrgSid())) { + importSleepData.setUseOrgSid(order.getUseOrgSid()); + } + if (StringUtils.isNotBlank(order.getOrgSidPath())) { + importSleepData.setOrgSidPath(order.getOrgSidPath()); + } + } + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid, vinNo).getData(); + if (null != orderVehicle) { + importSleepData.setBusVinSid(orderVehicle.getSid()); + } + importSleepData.setScheduleSid(otherSchedule.getSid()); + importSleepData.setPolicyOrOther("1"); + if (StringUtils.isNotBlank(otherSchedule.getLoanContractSid())) { + importSleepData.setLoanContractSid(otherSchedule.getLoanContractSid()); + } + if (StringUtils.isNotBlank(otherSchedule.getLoanContractNo())) { + importSleepData.setLoanContractNo(otherSchedule.getLoanContractNo()); + } + if (StringUtils.isNotBlank(otherSchedule.getBorrowerSid())) { + importSleepData.setBorrowerSid(otherSchedule.getBorrowerSid()); + } + if (StringUtils.isNotBlank(otherSchedule.getOtherBankNo())) { + importSleepData.setBankContractNo(otherSchedule.getOtherBankNo()); + } + } else { + setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "不存在，请先导入还款计划主表"); + } + } + + } + } + if (null != setMsg && setMsg.size() > 0) { + for (String s : setMsg) { + sbMsg.append(s).append("，"); + } + sbMsg.delete(sbMsg.length() - 1, sbMsg.length()); + if (StringUtils.isNotBlank(sbMsg.toString())) { + return rb.setMsg(sbMsg.toString()); + } + } + size = list.size(); + List planDetails = new ArrayList<>(); + for (ImportSleepData importSleepData : list) { + LoanRepaymentPlanDetails p = new LoanRepaymentPlanDetails(); + BeanUtil.copyProperties(importSleepData, p, "id", "sid"); + p.setCreateBySid(userSid); + planDetails.add(p); + } + loanRepaymentPlanDetailsService.saveList(planDetails); + } catch (Exception e) { + e.printStackTrace(); + } + return rb.success().setMsg("成功导入" + size + "条数据"); + } + + private ReturnSleepMsp getSleepSheetVal(Sheet sheet) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + ReturnSleepMsp returnMsg = new ReturnSleepMsp(); + List voList = new ArrayList<>(); + Set setMsg = new HashSet<>(); + Row row1 = sheet.getRow(1); + Map header = new HashMap<>(); + Map map = new HashMap<>(); + for (int i = 0; i < 7; i++) { + String trim = new String(); + try { + trim = getCellVal(row1.getCell(i)).toString().trim(); + String temp = getCellVal(row1.getCell(i)).toString().trim(); + if (StringUtils.isNotBlank(temp)) { + header.put(i, temp); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + for (int r = 2; r <= sheet.getLastRowNum(); r++) { + ImportSleepData info = new ImportSleepData(); + Row row = sheet.getRow(r); + if (row == null) { + continue; + } + for (int i = 0; i < header.size(); i++) { +// String trim = new String(); + try { +// trim = getCellVal(row.getCell(i)).toString().trim(); + String temp = ""; + if (null != getCellVal(row.getCell(i))) { + temp = getCellVal(row.getCell(i)).toString().trim(); + } + String head = header.get(i); + String field = ""; + if (StringUtils.isNotBlank(temp)) { + field = temp; + } + if (head.equals("资方合同编号")) { + if (StringUtils.isBlank(field)) { + setMsg.add("第" + (r + 1) + "行资方合同编号不能为空"); + } + info.setBankContractNo(field); + } + if (head.equals("借款人")) { + info.setBorrowerName(field); + } + if (head.equals("车架号")) { + info.setVinNo(field); + } + if (head.equals("期数")) { + if (StringUtils.isNotBlank(field)) { + if (field.contains(".")) { + double v = Double.parseDouble(field); + int intValue = (int) v; + field = String.valueOf(intValue); + } + } + info.setPeriod(field); + } + if (head.equals("应还日期")) { + if (StringUtils.isNotBlank(field)) { + if (field.contains("-")) { + try { + Date parse = sdf.parse(field); + field = sdf.format(parse); + } catch (Exception e) { + e.printStackTrace(); + setMsg.add("第" + (r + 1) + "行应还日期格式不正确"); + } + } else { + try { + Date setupTime = HSSFDateUtil.getJavaDate(Double.valueOf(field)); + field = sdf.format(setupTime); + } catch (Exception e) { + e.printStackTrace(); + setMsg.add("第" + (r + 1) + "行应还日期格式不正确"); + } + } + } else { + setMsg.add("第" + (r + 1) + "行应还日期格式不正确"); + } + info.setDueDate(field); + } + if (head.equals("应还月还")) { + if (StringUtils.isBlank(field)) { + field = "0"; + } + info.setDueMoney(field); + } + if (head.equals("公司")) { + info.setUseOrgName(field); + } + } catch (Exception e) { + e.printStackTrace(); + continue; + } + } + voList.add(info); + } + returnMsg.setList(voList); + returnMsg.setSetMsg(setMsg); + return returnMsg; + } + + public void generateHistoryData(List data, String userSid) { + List planDetails = new ArrayList<>();//还款计划表明细 + List histories = new ArrayList<>();//还款记录 + List jrList = new ArrayList<>();//金融应收 + List loanFundDays = new ArrayList<>();//资金占用费生成记录 + for (LoanRepaymentSchedule schedule : data) { + BigDecimal Q = BigDecimal.ZERO; //累欠金额 + BigDecimal T = BigDecimal.ZERO; //其中公司垫还资方金额 + BigDecimal L = BigDecimal.ZERO; //垫资方逾期利息 + BigDecimal B = BigDecimal.ZERO; //资金占用费 + if (null != schedule.getImportTiredMoney()) { + Q = schedule.getImportTiredMoney(); + } + if (null != schedule.getImportPaymentMoney()) { + T = schedule.getImportPaymentMoney(); + } + if (null != schedule.getImportInterest()) { + L = schedule.getImportInterest(); + } + if (null != schedule.getImportFund()) { + B = schedule.getImportFund(); + } + BigDecimal Q1 = Q; //Q的剩余金额 初始值Q1 = Q + BigDecimal T1 = T; //T的剩余金额 初始值T1 = T + boolean isOther = false; //资方是否相同 0否 1是 + int md = 0; //主产品估算期数 + int od = 0; //其他融估算期数 + int M1 = 0;//主产品最大还款期数 + int M2 = 0;//其他融最大还款期数 + int mainPeriod = Integer.parseInt(schedule.getMainPeriod()); //主产品期数 + int otherPeriod = 0; + md = getDiffPeriod(new Date(), schedule.getMainRepayDate()); + String isOtherPolicy = schedule.getIsOtherPolicy(); + String sameBank = schedule.getSameBank(); + if (isOtherPolicy.equals("0")) { + isOther = true; + } else if (isOtherPolicy.equals("1")) { + if (sameBank.equals("1")) { + isOther = true; + } + } + if (!isOther) { + otherPeriod = Integer.parseInt(schedule.getOtherPeriod()); + od = getDiffPeriod(new Date(), schedule.getOtherRepayDate()); + } + if (md > mainPeriod) { + M1 = mainPeriod; + } else { + M1 = md; + } + if (od > otherPeriod) { + M2 = otherPeriod; + } else { + M2 = od; + } + if (isOther) { + List m = loanRepaymentPlanDetailsService.selByMainSid(schedule.getSid()); + List o = new ArrayList<>(); + if (Q.compareTo(BigDecimal.ZERO) == 0) { + for (int i = 0; i < M1; i++) { + LoanRepaymentPlanDetails plan = m.get(i); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + if (i == M1 - 1) { + if (L.compareTo(BigDecimal.ZERO) > 0) { + plan.setPaymentInterest(L); + plan.setOverdue(0); + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(plan.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L); + jr.setCurrentReceivableMoney(L); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jr.setIsEnable(3); + jrList.add(jr); + } + if (B.compareTo(BigDecimal.ZERO) > 0) { + plan.setOverdue(0); + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(plan.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(B); + jr.setCurrentReceivableMoney(B); + jr.setPayCostTitleKey("006"); + jr.setPayCostTitleValue("资金占用费"); + jr.setIsEnable(3); + jrList.add(jr); + LoanFundDay fundDay = new LoanFundDay(); + fundDay.setCreateBySid(userSid); + fundDay.setCreateDate(returnYesterday()); + fundDay.setPaymentMoney(new BigDecimal("0")); + fundDay.setFund(B); + fundDay.setBusSid(plan.getSid()); + fundDay.setIsEnable(3); + loanFundDays.add(fundDay); + } + if (L.compareTo(BigDecimal.ZERO) > 0 || B.compareTo(BigDecimal.ZERO) > 0) { + planDetails.add(plan); + } + } + + } + } + if (Q.compareTo(BigDecimal.ZERO) > 0) { + if (T.compareTo(BigDecimal.ZERO) == 0) { + if (L.compareTo(BigDecimal.ZERO) > 0) { + LoanRepaymentPlanDetails plan = m.get(M1 - 1); + plan.setPaymentInterest(L); + plan.setOverdue(0); + planDetails.add(plan); + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(plan.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L); + jr.setCurrentReceivableMoney(L); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jrList.add(jr); + } + } + if (T.compareTo(BigDecimal.ZERO) > 0) { + int M = maxInt(M1, M2); //取最大还款期数 + for (int i = M; i <= M && i > 0; i--) { + BigDecimal m1i = BigDecimal.ZERO; //主产品月还 + BigDecimal m2i = BigDecimal.ZERO; //其他融月还 + if (i <= M1) { + BigDecimal temp = BigDecimal.ZERO; + BigDecimal D1 = BigDecimal.ZERO; + LoanRepaymentPlanDetails p = m.get(i - 1); + m1i = p.getDueMoney(); + if (T1.compareTo(BigDecimal.ZERO) > 0) { + //垫款金额、垫资方逾期利息 + D1 = T1.compareTo(m1i) >= 0 ? m1i : T1; + BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + T1 = T1.subtract(D1); + p.setPaymentInterest(L1); + p.setOverdue(0); + p.setPaymentMoney(D1); + if (L1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L1); + jr.setCurrentReceivableMoney(L1); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jrList.add(jr); + } + } + if (Q1.compareTo(BigDecimal.ZERO) > 0) { + //资金占用费 + temp = Q1.compareTo(m1i) >= 0 ? m1i : Q1; + BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + if (Q1.compareTo(m1i) < 0) { + //生成 i 期还款记录，月还金额 m1i - Q1 + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(m1i.subtract(Q1)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + p.setOverdue(0); + if (B1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(B1); + jr.setCurrentReceivableMoney(B1); + jr.setPayCostTitleKey("006"); + jr.setPayCostTitleValue("资金占用费"); + jrList.add(jr); + LoanFundDay fundDay = new LoanFundDay(); + fundDay.setCreateBySid(userSid); + fundDay.setIsEnable(3); + fundDay.setCreateDate(returnYesterday()); + fundDay.setPaymentMoney(p.getPaymentMoney()); + fundDay.setFund(B1); + fundDay.setBusSid(p.getSid()); + loanFundDays.add(fundDay); + } + Q1 = Q1.subtract(temp); + } + if (T1.compareTo(BigDecimal.ZERO) > 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { + planDetails.add(p); + } + if (Q1.compareTo(BigDecimal.ZERO) == 0) { + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(p.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + } + if (i <= M2) { + BigDecimal temp = BigDecimal.ZERO; + BigDecimal D1 = BigDecimal.ZERO; + LoanRepaymentPlanDetails p = o.get(i - 1); + m2i = p.getDueMoney(); + if (T1.compareTo(BigDecimal.ZERO) > 0) { + //垫款金额、垫资方逾期利息 + D1 = T1.compareTo(m2i) >= 0 ? m2i : T1; + BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + T1 = T1.subtract(D1); + p.setPaymentInterest(L1); + p.setOverdue(0); + p.setPaymentMoney(D1); + if (L1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L1); + jr.setCurrentReceivableMoney(L1); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jrList.add(jr); + } + } + if (Q1.compareTo(BigDecimal.ZERO) > 0) { + //资金占用费 + temp = Q1.compareTo(m2i) >= 0 ? m2i : Q1; + BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + if (Q1.compareTo(m2i) < 0) { + //生成 i 期还款记录，月还金额 m1i - Q1 + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(m2i.subtract(Q1)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + p.setOverdue(0); + if (B1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(B1); + jr.setCurrentReceivableMoney(B1); + jr.setPayCostTitleKey("006"); + jr.setPayCostTitleValue("资金占用费"); + jrList.add(jr); + LoanFundDay fundDay = new LoanFundDay(); + fundDay.setCreateBySid(userSid); + fundDay.setIsEnable(3); + fundDay.setCreateDate(returnYesterday()); + fundDay.setPaymentMoney(p.getPaymentMoney()); + fundDay.setFund(B1); + fundDay.setBusSid(p.getSid()); + loanFundDays.add(fundDay); + } + Q1 = Q1.subtract(temp); + } + if (T1.compareTo(BigDecimal.ZERO) > 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { + planDetails.add(p); + } + if (Q1.compareTo(BigDecimal.ZERO) == 0) { + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(p.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + } + + } + + + } + } + } else { + M2 = getDiffPeriod(new Date(), schedule.getOtherRepayDate()); + List m = loanRepaymentPlanDetailsService.selByMainSidAndPolicyOrOther(schedule.getSid(), "0"); + List o = loanRepaymentPlanDetailsService.selByMainSidAndPolicyOrOther(schedule.getSid(), "1"); + if (Q.compareTo(BigDecimal.ZERO) == 0) { + for (int i = 0; i < M1; i++) { + LoanRepaymentPlanDetails plan = m.get(i); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + if (i == M1 - 1) { + if (L.compareTo(BigDecimal.ZERO) > 0) { + plan.setPaymentInterest(L); + plan.setOverdue(0); + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(plan.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L); + jr.setCurrentReceivableMoney(L); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jrList.add(jr); + } + if (B.compareTo(BigDecimal.ZERO) > 0) { + plan.setOverdue(0); + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(plan.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(B); + jr.setCurrentReceivableMoney(B); + jr.setPayCostTitleKey("006"); + jr.setPayCostTitleValue("资金占用费"); + jrList.add(jr); + LoanFundDay fundDay = new LoanFundDay(); + fundDay.setCreateBySid(userSid); + fundDay.setIsEnable(3); + fundDay.setCreateDate(returnYesterday()); + fundDay.setPaymentMoney(new BigDecimal("0")); + fundDay.setFund(B); + fundDay.setBusSid(plan.getSid()); + loanFundDays.add(fundDay); + } + if (L.compareTo(BigDecimal.ZERO) > 0 || B.compareTo(BigDecimal.ZERO) > 0) { + planDetails.add(plan); + } + } + } + for (int i = 0; i < M2; i++) { + LoanRepaymentPlanDetails plan = o.get(i); + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(plan.getDueDate()); + history.setActualMoney(plan.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(plan.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + } + if (Q.compareTo(BigDecimal.ZERO) > 0) { + if (T.compareTo(BigDecimal.ZERO) == 0) { + if (L.compareTo(BigDecimal.ZERO) > 0) { + LoanRepaymentPlanDetails plan = m.get(M1 - 1); + plan.setPaymentInterest(L); + plan.setOverdue(0); + planDetails.add(plan); + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(plan.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L); + jr.setCurrentReceivableMoney(L); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jrList.add(jr); + } + } + if (T.compareTo(BigDecimal.ZERO) > 0) { + int M = maxInt(M1, M2); //取最大还款期数 + for (int i = M; i <= M && i > 0; i--) { + BigDecimal m1i = BigDecimal.ZERO; //主产品月还 + BigDecimal m2i = BigDecimal.ZERO; //其他融月还 + if (i <= M1) { + BigDecimal temp = BigDecimal.ZERO; + BigDecimal D1 = BigDecimal.ZERO; + LoanRepaymentPlanDetails p = m.get(i - 1); + m1i = p.getDueMoney(); + if (T1.compareTo(BigDecimal.ZERO) > 0) { + //垫款金额、垫资方逾期利息 + D1 = T1.compareTo(m1i) >= 0 ? m1i : T1; + BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + T1 = T1.subtract(D1); + p.setPaymentInterest(L1); + p.setOverdue(0); + p.setPaymentMoney(D1); + if (L1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L1); + jr.setCurrentReceivableMoney(L1); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jrList.add(jr); + } + } + if (Q1.compareTo(BigDecimal.ZERO) > 0) { + //资金占用费 + temp = Q1.compareTo(m1i) >= 0 ? m1i : Q1; + BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + if (Q1.compareTo(m1i) < 0) { + //生成 i 期还款记录，月还金额 m1i - Q1 + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(m1i.subtract(Q1)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + p.setOverdue(0); + if (B1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(B1); + jr.setCurrentReceivableMoney(B1); + jr.setPayCostTitleKey("006"); + jr.setPayCostTitleValue("资金占用费"); + jrList.add(jr); + LoanFundDay fundDay = new LoanFundDay(); + fundDay.setCreateBySid(userSid); + fundDay.setIsEnable(3); + fundDay.setCreateDate(returnYesterday()); + fundDay.setPaymentMoney(p.getPaymentMoney()); + fundDay.setFund(B1); + fundDay.setBusSid(p.getSid()); + loanFundDays.add(fundDay); + } + Q1 = Q1.subtract(temp); + } + if (T1.compareTo(BigDecimal.ZERO) > 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { + planDetails.add(p); + } + if (Q1.compareTo(BigDecimal.ZERO) == 0) { + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(p.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + } + if (i <= M2) { + BigDecimal temp = BigDecimal.ZERO; + BigDecimal D1 = BigDecimal.ZERO; + LoanRepaymentPlanDetails p = o.get(i - 1); + m2i = p.getDueMoney(); + if (T1.compareTo(BigDecimal.ZERO) > 0) { + //垫款金额、垫资方逾期利息 + D1 = T1.compareTo(m2i) >= 0 ? m2i : T1; + BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + T1 = T1.subtract(D1); + p.setPaymentInterest(L1); + p.setOverdue(0); + p.setPaymentMoney(D1); + if (L1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(L1); + jr.setCurrentReceivableMoney(L1); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jrList.add(jr); + } + } + if (Q1.compareTo(BigDecimal.ZERO) > 0) { + //资金占用费 + temp = Q1.compareTo(m2i) >= 0 ? m2i : Q1; + BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + if (Q1.compareTo(m2i) < 0) { + //生成 i 期还款记录，月还金额 m1i - Q1 + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(m2i.subtract(Q1)); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + p.setOverdue(0); + if (B1.compareTo(BigDecimal.ZERO) > 0) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + jr.setBusSid(p.getSid()); + jr.setKxState("01"); + jr.setIsEnable(3); + jr.setReveivableMoney(B1); + jr.setCurrentReceivableMoney(B1); + jr.setPayCostTitleKey("006"); + jr.setPayCostTitleValue("资金占用费"); + jrList.add(jr); + LoanFundDay fundDay = new LoanFundDay(); + fundDay.setCreateBySid(userSid); + fundDay.setIsEnable(3); + fundDay.setCreateDate(returnYesterday()); + fundDay.setPaymentMoney(p.getPaymentMoney()); + fundDay.setFund(B1); + fundDay.setBusSid(p.getSid()); + loanFundDays.add(fundDay); + } + Q1 = Q1.subtract(temp); + } + if (T1.compareTo(BigDecimal.ZERO) > 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { + planDetails.add(p); + } + if (Q1.compareTo(BigDecimal.ZERO) == 0) { + LoanRepaymentHistory history = new LoanRepaymentHistory(); + history.setCreateBySid(userSid); + history.setDataTime(new Date()); + history.setUpdateState("1"); + history.setUpdateTime(new Date()); + history.setActualDate(p.getDueDate()); + history.setActualMoney(p.getDueMoney()); + history.setBuckleKey("003"); + history.setBuckle("审核通过"); + history.setReturnWayKey("01"); + history.setReturnWay("直还"); + history.setPayState(0); + history.setIsEnable(3); + history.setPlanDetailSid(p.getSid()); + history.setScheduleSid(schedule.getSid()); + histories.add(history); + } + } + + } + } + } + } + } + if (planDetails.size() > 0 && !planDetails.isEmpty()) { + loanRepaymentPlanDetailsService.updateImportDataList(planDetails); + } + if (histories.size() > 0 && !histories.isEmpty()) { + loanRepaymentHistoryService.saveList(histories); + } + if (loanFundDays.size() > 0 && !loanFundDays.isEmpty()) { + loanFundDayService.saveList(loanFundDays); + } + if (jrList.size() > 0 && !jrList.isEmpty()) { + finUncollectedReceivablesDetailedJRFeign.saveList(jrList); + } + + + } + + public int maxInt(int a, int b) { + if (a > b) { + return a; + } else { + return b; + } + } + + public String returnYesterday() { + Date today = new Date(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(today); + calendar.set(Calendar.HOUR_OF_DAY, 23); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.SECOND, 59); + //获取前几天的都可以，对-1进行改变即可 + //获取后一天的时间也可以，把-1改为1即可 + //后几天和前几天同理 + calendar.add(Calendar.DAY_OF_MONTH, -1); + Date d = calendar.getTime(); + return sdf.format(d); + } + + + /** + * @param date1 现日期 + * @param date2 首期还款日期 + * @return + */ + public int getDiffPeriod(Date date1, Date date2) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String fd1 = sdf.format(date1); + String fd2 = sdf.format(date2); + String[] split1 = fd1.split("-"); + String[] split2 = fd2.split("-"); + int y1 = Integer.parseInt(split1[0]); + int m1 = Integer.parseInt(split1[1]); + int d1 = Integer.parseInt(split1[2]); + int y2 = Integer.parseInt(split2[0]); + int m2 = Integer.parseInt(split2[1]); + int d2 = Integer.parseInt(split2[2]); + int num = 0; + //判断年数 + if (y1 == y2) { + if (m1 == m2) { + if (d1 > d2) { + num = num + 1; + } + } else if (m1 > m2) { + num = m1 - m2; + if (d1 > d2) { + num = num + 1; + } + } + } else if (y1 > y2) { + if (m1 >= m2) { + num = (y1 - y2) * 12; + num = num + (m1 - m2); + if (d1 > d2) { + num = num + 1; + } + } else { + num = (y1 - y2 - 1) * 12; + num = num + 13 - m1; + num = num + 13 - m2; + if (d1 > d2) { + num = num + 1; + } + } + } + return num; + } + private ReturnMsg getSheetVal(Sheet sheet) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); ReturnMsg returnMsg = new ReturnMsg(); List voList = new ArrayList<>(); Set setMsg = new HashSet<>(); Row row1 = sheet.getRow(0); Map header = new HashMap<>(); Map map = new HashMap<>(); - for (int i = 0; i < row1.getPhysicalNumberOfCells(); i++) { + for (int i = 0; i < 34; i++) { String trim = new String(); try { trim = getCellVal(row1.getCell(i)).toString().trim(); @@ -5124,6 +6559,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService sids = new ArrayList<>(); + List schedules = baseMapper.selectList(new QueryWrapper().eq("isEnable", 2)); + if (!schedules.isEmpty()) { + generateHistoryData(schedules, userSid); + for (LoanRepaymentSchedule schedule : schedules) { + sids.add(schedule.getSid()); + } + int i = baseMapper.updateIsEnable(sids); + } else { + return rb.setMsg("暂无可生成数据"); + } + return rb.success(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupListVo.java index 90c444f85a..cd5e414281 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupListVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupListVo.java @@ -1,7 +1,10 @@ package com.yxt.anrui.as.api.asservicegroup; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author Fan * @description @@ -11,4 +14,7 @@ import lombok.Data; public class AsServiceGroupListVo { private String groupSid; //班组sid private String groupName; //班组名称 + private List members; + + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/MemberVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/MemberVo.java new file mode 100644 index 0000000000..299ebb21a4 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/MemberVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.as.api.asservicegroup; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/2 10:13 + */ +@Data +public class MemberVo { + + @ApiModelProperty("成员sid") + private String memberSid; + @ApiModelProperty("成员姓名") + private String memberName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java index c9f02deee8..5a33e27a60 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java @@ -58,7 +58,7 @@ public interface AsServiceGroupMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List getGroupList(@Param("useOrgSid") String useOrgSid); + List getGroupList(@Param("useOrgSid") String useOrgSid); @Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and isDelete = '0'") int checkByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml index 513a986336..b9af7258de 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml @@ -9,9 +9,8 @@ ${ew.sqlSegment} - + select * from as_service_group where useOrgSid = #{useOrgSid} and isDelete = '0' diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java index b0b42c413a..be9179f0cc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java @@ -178,8 +178,8 @@ public class AsServiceGroupService extends MybatisBaseService memberSids = dto.getMemberSids(); List memberNames = dto.getMemberNames(); - entity.setMemberSid(StringUtils.join(memberSids,",")); - entity.setMemberName(StringUtils.join(memberNames,",")); + entity.setMemberSid(StringUtils.join(memberSids, ",")); + entity.setMemberName(StringUtils.join(memberNames, ",")); baseMapper.insert(entity); } @@ -192,8 +192,8 @@ public class AsServiceGroupService extends MybatisBaseService memberSids = dto.getMemberSids(); List memberNames = dto.getMemberNames(); - entity.setMemberSid(StringUtils.join(memberSids,",")); - entity.setMemberName(StringUtils.join(memberNames,",")); + entity.setMemberSid(StringUtils.join(memberSids, ",")); + entity.setMemberName(StringUtils.join(memberNames, ",")); baseMapper.updateById(entity); } @@ -203,18 +203,41 @@ public class AsServiceGroupService extends MybatisBaseService getGroupList(String useOrgSid) { - List list = baseMapper.getGroupList(useOrgSid); - return list; + List list = baseMapper.getGroupList(useOrgSid); + List voList = new ArrayList<>(); + if (!list.isEmpty()) { + for (AsServiceGroup asServiceGroup : list) { + AsServiceGroupListVo vo = new AsServiceGroupListVo(); + vo.setGroupSid(asServiceGroup.getSid()); + vo.setGroupName(asServiceGroup.getGroupName()); + List members = new ArrayList<>(); + if (StringUtils.isNotBlank(asServiceGroup.getMemberSid())) { + String memberSid = asServiceGroup.getMemberSid(); + String memberName = asServiceGroup.getMemberName(); + String[] splitSid = memberSid.split(","); + String[] splitName = memberName.split(","); + for (int i = 0; i < splitSid.length; i++) { + MemberVo memberVo = new MemberVo(); + memberVo.setMemberSid(splitSid[i]); + memberVo.setMemberName(splitName[i]); + members.add(memberVo); + } + vo.setMembers(members); + } + voList.add(vo); + } + } + return voList; } public void delete(String[] sids) {