diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 867cbba40b..3aa9df3d07 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -32,10 +32,7 @@ import com.yxt.anrui.base.biz.commoncontract.CommonContractService; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; -import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply; -import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery; -import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo; -import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign; +import com.yxt.anrui.buscenter.api.busdeliveredapply.*; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; @@ -69,8 +66,11 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerFeign; +import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo; +import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; @@ -156,6 +156,10 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto)); @@ -2331,7 +2335,58 @@ public class BaseVehicleOutService extends MybatisBaseService detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid()); + if (null != detailsVoResultBean.getData()) { + if ("01".equals(detailsVoResultBean.getData().getTypeKey())) { + isLoan = "01"; + } else { + isLoan = "02"; + } + } + } + } + if (StringUtils.isNotBlank(isLoan)) { + String vinSid = vehicleOut.getVinSid(); + BusSalesOrderVehicle vehicle = busSalesOrderVehicleFeign.selectByOrderSidAndVehSid(orderSid, vinSid).getData(); + if (null != vehicle) { + PushOtherDocument push = new PushOtherDocument(); + push.setBusVinSid(vehicle.getSid()); + push.setVinSid(vehicle.getLinkSid()); + push.setOrderSid(busSalesOrder.getSid()); + String borrowerSid = vehicle.getBorrowerSid(); + if ("01".equals(isLoan)) { + LoanNoGuaranteeCreditReviewDetailsVo data = loanNoGuaranteeCreditReviewFeign.details(borrowerSid).getData(); + if (null != data) { + if (StringUtils.isNotBlank(data.getIsCompInvoic())) { + push.setIsKp(data.getIsCompInvoic()); + } else { + push.setIsKp("0"); + } + } + } else if ("02".equals(isLoan)) { + String isKp = loanHomevisitInvestigateFeign.selIsCompanyBuy(orderSid, borrowerSid).getData(); + if (StringUtils.isNotBlank(isKp)) { + push.setIsKp(isKp); + } else { + push.setIsKp("0"); + } + } + busSalesOrderLoancontractFeign.pushOtherDocument(push); + } + } + } } + } return rb.success(); 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 31a17780fb..6cc0f393ec 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 @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesorderloancontract; +import com.yxt.anrui.buscenter.api.busdeliveredapply.PushOtherDocument; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -129,4 +130,10 @@ public interface BusSalesOrderLoancontractFeign { @PostMapping("/delByOrderSidAndDkrSid") @ResponseBody ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid); + + @ApiOperation("推送融资放款的其他应收单应收") + @PostMapping("/pushOtherDocument") + @ResponseBody + ResultBean pushOtherDocument(@RequestBody PushOtherDocument push); + } \ No newline at end of file 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 92a11f95c2..4e30c02b96 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 @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesorderloancontract; +import com.yxt.anrui.buscenter.api.busdeliveredapply.PushOtherDocument; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -124,4 +125,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean delByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) { return null; } + + @Override + public ResultBean pushOtherDocument(PushOtherDocument push) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java index bf9f11f4b6..39525bd89b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java @@ -33,7 +33,7 @@ public class BusSalesVehicleQuery implements Query { private String saleDateStart; @ApiModelProperty("销售日期结束") private String saleDateEnd; - @ApiModelProperty("交付状态") + @ApiModelProperty("交付状态:1已交付，0未交付") private String handoverState; @ApiModelProperty("交付日期开始") 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 23c6bf09be..69f64b3669 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 @@ -1624,6 +1624,19 @@ public class BusSalesOrderService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //将应收未收中的订金设置为作废 + //-------修改应收未收款项表中的款项状态为02作废------------ + List vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid()); + StateQuery stateQuery = new StateQuery(); + List busVinSidListState = new ArrayList<>(); + if (!vehicleList.isEmpty()) { + vehicleList.stream().forEach(v -> { + busVinSidListState.add(v.getSid()); + }); + stateQuery.setKxState("02"); + stateQuery.setBusVinSid(busVinSidListState); + ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery); + } //再加回来 BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid()); if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) { @@ -1681,6 +1694,19 @@ public class BusSalesOrderService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //将应收未收中的订金设置为作废 + //-------修改应收未收款项表中的款项状态为02作废------------ + List vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid()); + StateQuery stateQuery = new StateQuery(); + List busVinSidListState = new ArrayList<>(); + if (!vehicleList.isEmpty()) { + vehicleList.stream().forEach(v -> { + busVinSidListState.add(v.getSid()); + }); + stateQuery.setKxState("02"); + stateQuery.setBusVinSid(busVinSidListState); + ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery); + } //再加回来 BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid()); if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) { @@ -1732,19 +1758,7 @@ public class BusSalesOrderService extends MybatisBaseService vehicleList = busSalesOrderVehicleService.selectListByOrderSid(query.getBusinessSid()); - StateQuery stateQuery = new StateQuery(); - List busVinSidListState = new ArrayList<>(); - if (!vehicleList.isEmpty()) { - vehicleList.stream().forEach(v -> { - busVinSidListState.add(v.getSid()); - }); - stateQuery.setKxState("02"); - stateQuery.setBusVinSid(busVinSidListState); - ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery); - } + } return rb.setMsg("操作失败!提交的数据不一致!"); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 7ce07f9198..67c52ebfc6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesorderloancontract; +import com.yxt.anrui.buscenter.api.busdeliveredapply.PushOtherDocument; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -54,103 +55,110 @@ import java.util.List; @RequestMapping("v1/bussalesorderloancontract") public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractFeign { - @Autowired - private BusSalesOrderLoancontractService busSalesOrderLoancontractService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busSalesOrderLoancontractService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto){ - ResultBean rb = ResultBean.fireFail(); - String sid = busSalesOrderLoancontractService.saveOrUpdateDto(dto); - return rb.success().setData(sid); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private BusSalesOrderLoancontractService busSalesOrderLoancontractService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busSalesOrderLoancontractService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = busSalesOrderLoancontractService.saveOrUpdateDto(dto); + return rb.success().setData(sid); + } + + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - busSalesOrderLoancontractService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + busSalesOrderLoancontractService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BusSalesOrderLoancontractDetailsVo vo = busSalesOrderLoancontractService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - public ResultBean> selectByBorrowerSid(String saleOrderBorrowerSid) { - ResultBean rb = ResultBean.fireFail(); - List busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractService.selectByBorrowerSid(saleOrderBorrowerSid); - return rb.success().setData(busSalesOrderLoancontractDetailsVos); - } - - @Override - public ResultBean fetchDetailsByOrderSid(String sid) { - ResultBean rb = ResultBean.fireFail(); - BusSalesOrderLoancontract entity = busSalesOrderLoancontractService.fetchDetailsByOrderSid(sid); - return rb.success().setData(entity); - } - - @Override - public ResultBean updateBankConAndBusNo(String loanContractSid, String bankContractNo) { - return busSalesOrderLoancontractService.updateBankConAndBusNo(loanContractSid,bankContractNo); - } - - @Override - public ResultBean> listPageForRepay(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busSalesOrderLoancontractService.listPageForRepay(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { - return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush); - } - - @Override - public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) { - return busSalesOrderLoancontractService.pushOtherReceivable(loanOtherReceivablePush); - } - - @Override - public ResultBean> fetchAllByOrderSid(String sid) { - return busSalesOrderLoancontractService.fetchAllByOrderSid(sid); - } - - @Override - public ResultBean checkContractNo(String contractNo) { - return busSalesOrderLoancontractService.checkContractNo(contractNo); - } - - @Override - public ResultBean> fetchAllByBorrowerSid(String saleOrderBorrowerSid) { - return busSalesOrderLoancontractService.fetchAllByBorrowerSid(saleOrderBorrowerSid); - } - - @Override - public ResultBean> fetchAllByOrderSidAndDkrSid(String saleOrderSid, String saleOrderBorrowerSid) { - return busSalesOrderLoancontractService.fetchAllByOrderSidAndDkrSid(saleOrderSid,saleOrderBorrowerSid); - } - - @Override - public ResultBean delByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) { - return busSalesOrderLoancontractService.delByOrderSidAndDkrSid(saleOrderSid,borrowerSid); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderLoancontractDetailsVo vo = busSalesOrderLoancontractService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> selectByBorrowerSid(String saleOrderBorrowerSid) { + ResultBean rb = ResultBean.fireFail(); + List busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractService.selectByBorrowerSid(saleOrderBorrowerSid); + return rb.success().setData(busSalesOrderLoancontractDetailsVos); + } + + @Override + public ResultBean fetchDetailsByOrderSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderLoancontract entity = busSalesOrderLoancontractService.fetchDetailsByOrderSid(sid); + return rb.success().setData(entity); + } + + @Override + public ResultBean updateBankConAndBusNo(String loanContractSid, String bankContractNo) { + return busSalesOrderLoancontractService.updateBankConAndBusNo(loanContractSid, bankContractNo); + } + + @Override + public ResultBean> listPageForRepay(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busSalesOrderLoancontractService.listPageForRepay(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { + return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush); + } + + @Override + public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) { + return busSalesOrderLoancontractService.pushOtherReceivable(loanOtherReceivablePush); + } + + @Override + public ResultBean> fetchAllByOrderSid(String sid) { + return busSalesOrderLoancontractService.fetchAllByOrderSid(sid); + } + + @Override + public ResultBean checkContractNo(String contractNo) { + return busSalesOrderLoancontractService.checkContractNo(contractNo); + } + + @Override + public ResultBean> fetchAllByBorrowerSid(String saleOrderBorrowerSid) { + return busSalesOrderLoancontractService.fetchAllByBorrowerSid(saleOrderBorrowerSid); + } + + @Override + public ResultBean> fetchAllByOrderSidAndDkrSid(String saleOrderSid, String saleOrderBorrowerSid) { + return busSalesOrderLoancontractService.fetchAllByOrderSidAndDkrSid(saleOrderSid, saleOrderBorrowerSid); + } + + @Override + public ResultBean delByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) { + return busSalesOrderLoancontractService.delByOrderSidAndDkrSid(saleOrderSid, borrowerSid); + } + + @Override + public ResultBean pushOtherDocument(PushOtherDocument push) { + ResultBean rb = ResultBean.fireFail(); + busSalesOrderLoancontractService.pushOtherDocument(push); + return rb.success(); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml index 335d0cf494..c0572b0a8f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml @@ -32,11 +32,11 @@ > 0 - + and length(bh.closingDate) >0 - + and (bh.closingDate is null or bh.closingDate = '') diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java index 7992f6b950..bd6402f12d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java @@ -58,7 +58,7 @@ public class BusSalesVehicleService { qw.like("bvoa.contractNo", query.getContractNo()); } if (StringUtils.isNotBlank(query.getSaleType())) { - qw.like("bvoa.saleTypeValue", query.getSaleType()); + qw.eq("bvoa.saleTypeKey", query.getSaleType()); } if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("bv.vinNo", query.getVinNo()); diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangjiaofu/cheliangjiaofu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangjiaofu/cheliangjiaofu.vue index 00f4a7d9c3..bd8d5248e2 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangjiaofu/cheliangjiaofu.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/cheliangjiaofu/cheliangjiaofu.vue @@ -24,7 +24,9 @@ - + + + @@ -38,7 +40,9 @@ - + + + @@ -132,6 +136,7 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import { listPage, exportExcel } from '@/api/cheiliangjiaofu/cheliangjiaofu' +import { typeValues } from '@/api/dictcommons/dictcommons' export default { name: 'CheLiangJiaoFu', @@ -165,6 +170,17 @@ export default { tableKey: 0, list: [], sids: [], + purchaseType_list: [], + handoverState_list: [ + { + dictKey: '0', + dictValue: '未交付' + }, + { + dictKey: '1', + dictValue: '已交付' + } + ], FormLoading: false, listLoading: false, listQuery: { @@ -194,12 +210,20 @@ export default { }, created() { // 初始化变量 + this.init() this.getList() }, mounted() { this.$refs['btnbar'].setButtonList(this.btnList) }, methods: { + init() { + typeValues({ type: 'purchaseType' }).then((res) => { + if (res.success) { + this.purchaseType_list = res.data + } + }) + }, // 搜索条件效果 clicksearchShow() { this.isSearchShow = !this.isSearchShow diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index f9463da2d3..c1f0d39068 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -1618,23 +1618,40 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService= 0) { - //已认款完成 - BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); - baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey()); - baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); - dtoList.add(baseVehicleStateDto); - } else { - //认款未完成 - BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); - baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey()); - baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); - dtoList.add(baseVehicleStateDto); + if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){ + String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid()); + String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid()); + if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) { + //已认款完成 + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey()); + baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); + dtoList.add(baseVehicleStateDto); + } else { + //认款未完成 + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey()); + baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); + dtoList.add(baseVehicleStateDto); + } + }else{ + //查询该车的所有认款，是否都已认完 + String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); + String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); + if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) { + //已认款完成 + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey()); + baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); + dtoList.add(baseVehicleStateDto); + } else { + //认款未完成 + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey()); + baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); + dtoList.add(baseVehicleStateDto); + } } - } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 88e8bf784b..492bb49391 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -317,13 +317,13 @@ diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java index 75b8b5b026..20e720080e 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java @@ -56,7 +56,7 @@ public interface DailyReportMapper extends BaseMapper { List selectReport3(@Param("date") String date, @Param("busOrgSid") String busOrgSid); - List selectByBrand2(@Param("useOrgSid") String useOrgSid, @Param("date") String date); + List selectByBrand2(@Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper qw); - List selectReport4(@Param("join") List brandList, @Param("useOrgSid") String useOrgSid, @Param("date") String date); + List selectReport4(@Param("join") List brandList, @Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml index a09c9dd8cc..30811fd159 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml @@ -403,13 +403,6 @@ SELECT dr.brandSid linkSid, dr.brandName NAME, b.colspan - FROM daily_report dr left join ( @@ -418,16 +411,14 @@ from (SELECT ddr.brandSid FROM daily_report ddr left join - anrui_base.base_model_config bmv - on ddr.vehMConfigSid = bmv.sid + anrui_base.base_model_config bmc + on ddr.vehMConfigSid = bmc.sid left join anrui_base.base_vehicle_model bm on bm.sid = ddr.vehModelSid - WHERE DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{date} - and ddr.useOrgSid = #{useOrgSid} - group by ddr.brandSid, - bm.fuelTypeValue, - bm.emissionStandardValue) a + + ${ew.sqlSegment} + ) a group by a.brandSid) b on b.brandSid = dr.brandSid WHERE dr.useOrgSid = #{useOrgSid} @@ -582,13 +573,16 @@ from daily_report dr left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid - where dr.useOrgSid = #{useOrgSid} + + + ${ew.sqlSegment} + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java index 8e7b03c2b8..b33fb483c4 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java @@ -1059,9 +1059,18 @@ public class DailyReportService extends MybatisBaseService list4(String date, String useOrgSid) { ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); DailyReportAppVo dailyReportAppVo = new DailyReportAppVo(); dailyReportAppVo.setTitle("分公司" + date + "日报"); - List rows1 = baseMapper.selectByBrand2(useOrgSid, date); + qw.like("ddr.createTime",date); + qw.eq("ddr.useOrgSid",useOrgSid); + qw.groupBy("ddr.brandSid"); + qw.groupBy("bm.fuelTypeValue"); + qw.groupBy("bm.emissionStandardValue"); + List parameterVoList = baseMapper.selectByParameters(useOrgSid); + parameterVoList.removeAll(Collections.singleton(null)); + qw = getCommon(parameterVoList,qw); + List rows1 = baseMapper.selectByBrand2(useOrgSid, date,qw); rows1.removeAll(Collections.singleton(null)); dailyReportAppVo.setRow1(rows1); List brandList = rows1.stream().map(v -> v.getLinkSid()).collect(Collectors.toList()); @@ -1069,7 +1078,16 @@ public class DailyReportService extends MybatisBaseService dailyReportVoList = baseMapper.selectReport4(brandList, useOrgSid, date); + qw = new QueryWrapper<>(); + qw.eq("dr.useOrgSid",useOrgSid); + qw.like("dr.createTime",date); + qw.in("dr.brandSid",brandList); + qw.orderByDesc("dr.brandSid"); + qw.groupBy("dr.brandSid"); + qw.groupBy("bm.fuelTypeValue"); + qw.groupBy("bm.emissionStandardValue"); + qw = getCommon(parameterVoList,qw); + List dailyReportVoList = baseMapper.selectReport4(brandList, useOrgSid, date,qw); //燃料 List row2 = dailyReportVoList.stream().map(v -> v.getFuelTypeValue()).collect(Collectors.toList()); dailyReportAppVo.setRow2(row2); @@ -1310,82 +1328,182 @@ public class DailyReportService extends MybatisBaseService dynamicRows = new ArrayList<>(); - List parameterVoList = baseMapper.selectByParameters(useOrgSid); - parameterVoList.removeAll(Collections.singleton(null)); - for (int i = 0; i < parameterVoList.size(); i++) { - DailyParameterVo dailyParameterVo = parameterVoList.get(i); - String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1); - ParameterVo parameterVo = new ParameterVo(); - parameterVo.setName(dailyParameterVo.getColText()); + /*List parameterVoList = baseMapper.selectByParameters(useOrgSid); + parameterVoList.removeAll(Collections.singleton(null));*/ + int totalRowspan = 3; + if (!parameterVoList.isEmpty()) { + for (int i = 0; i < parameterVoList.size(); i++) { + DailyParameterVo dailyParameterVo = parameterVoList.get(i); + String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1); + ParameterVo parameterVo = new ParameterVo(); + parameterVo.setName(dailyParameterVo.getColText()); - List columnNames = dailyReportVoList.stream().map(v -> { - String columnName = ""; - try { - Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName()); - field.setAccessible(true); - columnName = (String) field.get(v); - } catch (NoSuchFieldException | IllegalAccessException e) { - e.printStackTrace(); - } - if (StringUtils.isBlank(columnName)) { - return "-"; - } else { - return columnName; - } - }).collect(Collectors.toList()); + List columnNames = dailyReportVoList.stream().map(v -> { + String columnName = ""; + try { + Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName()); + field.setAccessible(true); + columnName = (String) field.get(v); + } catch (NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } + if (StringUtils.isBlank(columnName)) { + return "-"; + } else { + return columnName; + } + }).collect(Collectors.toList()); // columnNames.add(""); - parameterVo.setRow(columnNames); - dynamicRows.add(parameterVo); + parameterVo.setRow(columnNames); + dynamicRows.add(parameterVo); + } + dailyReportAppVo.setDynamicRows(dynamicRows); + if (!dynamicRows.isEmpty()) { + for (int i = 0; i < dynamicRows.size(); i++) { + if (i > 6) { + break; + } else { + ParameterVo parameterVo = dynamicRows.get(i); + switch (i) { + case 0: + if (parameterVo != null) { + dailyReportAppVo.setRow101(parameterVo); + totalRowspan = totalRowspan + 1; + } + break; + case 1: + if (parameterVo != null) { + dailyReportAppVo.setRow102(parameterVo); + totalRowspan = totalRowspan + 1; + } + break; + case 2: + if (parameterVo != null) { + dailyReportAppVo.setRow103(parameterVo); + totalRowspan = totalRowspan + 1; + } + break; + case 3: + if (parameterVo != null) { + dailyReportAppVo.setRow104(parameterVo); + totalRowspan = totalRowspan + 1; + } + break; + case 4: + if (parameterVo != null) { + dailyReportAppVo.setRow105(parameterVo); + totalRowspan = totalRowspan + 1; + } + break; + case 5: + if (parameterVo != null) { + dailyReportAppVo.setRow106(parameterVo); + totalRowspan = totalRowspan + 1; + } + break; + case 6: + if (parameterVo != null) { + dailyReportAppVo.setRow107(parameterVo); + totalRowspan = totalRowspan + 1; + } + break; + default: + break; + } + } + } + } } - dailyReportAppVo.setDynamicRows(dynamicRows); - int totalRowspan = 3; - if (!dynamicRows.isEmpty()) { - for (int i = 0; i < dynamicRows.size(); i++) { + + dailyReportAppVo.setTotalRowspan(totalRowspan); + return rb.success().setData(dailyReportAppVo); + } + + + public QueryWrapper getCommon(List parameterVoList,QueryWrapper qw){ + if(!parameterVoList.isEmpty()){ + for (int i = 0; i < parameterVoList.size(); i++) { + DailyParameterVo dailyParameterVo = parameterVoList.get(i); + String tableName = Arrays.asList(dailyParameterVo.getTableNameKey().split("\\.")).get(1); if (i > 6) { break; } else { - ParameterVo parameterVo = dynamicRows.get(i); switch (i) { case 0: - if (parameterVo != null) { - dailyReportAppVo.setRow101(parameterVo); - totalRowspan = totalRowspan+1; + if ("base_model_config".equals(tableName)) { +// qw.groupBy("bmc." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bmc." + dailyParameterVo.getColName()); + } else if ("base_vehicle_model".equals(tableName)) { +// qw.groupBy("bm." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bm." + dailyParameterVo.getColName()); } break; case 1: - if (parameterVo != null) { - dailyReportAppVo.setRow102(parameterVo); - totalRowspan = totalRowspan+1; + if ("base_model_config".equals(tableName)) { +// qw.groupBy("bmc." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bmc." + dailyParameterVo.getColName()); + } else if ("base_vehicle_model".equals(tableName)) { +// qw.groupBy("bm." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bm." + dailyParameterVo.getColName()); } break; case 2: - if (parameterVo != null) { - dailyReportAppVo.setRow103(parameterVo); - totalRowspan = totalRowspan+1; + if ("base_model_config".equals(tableName)) { +// qw.groupBy("bmc." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bmc." + dailyParameterVo.getColName()); + } else if ("base_vehicle_model".equals(tableName)) { +// qw.groupBy("bm." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bm." + dailyParameterVo.getColName()); } break; case 3: - if (parameterVo != null) { - dailyReportAppVo.setRow104(parameterVo); - totalRowspan = totalRowspan+1; + if ("base_model_config".equals(tableName)) { +// qw.groupBy("bmc." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bmc." + dailyParameterVo.getColName()); + } else if ("base_vehicle_model".equals(tableName)) { +// qw.groupBy("bm." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bm." + dailyParameterVo.getColName()); } break; case 4: - if (parameterVo != null) { - dailyReportAppVo.setRow105(parameterVo); - totalRowspan = totalRowspan+1; + if ("base_model_config".equals(tableName)) { +// qw.groupBy("bmc." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bmc." + dailyParameterVo.getColName()); + } else if ("base_vehicle_model".equals(tableName)) { +// qw.groupBy("bm." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bm." + dailyParameterVo.getColName()); } break; case 5: - if (parameterVo != null) { - dailyReportAppVo.setRow106(parameterVo); - totalRowspan = totalRowspan+1; + if ("base_model_config".equals(tableName)) { +// qw.groupBy("bmc." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bmc." + dailyParameterVo.getColName()); + } else if ("base_vehicle_model".equals(tableName)) { +// qw.groupBy("bm." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bm." + dailyParameterVo.getColName()); } break; case 6: - if (parameterVo != null) { - dailyReportAppVo.setRow107(parameterVo); - totalRowspan = totalRowspan+1; + if ("base_model_config".equals(tableName)) { +// qw.groupBy("bmc." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bmc."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bmc." + dailyParameterVo.getColName()); + } else if ("base_vehicle_model".equals(tableName)) { +// qw.groupBy("bm." + dailyParameterVo.getColName()); + qw.groupBy("IFNULL(bm."+dailyParameterVo.getColName()+",'')"); + qw.orderByDesc("bm." + dailyParameterVo.getColName()); } break; default: @@ -1394,7 +1512,7 @@ public class DailyReportService extends MybatisBaseService files = new ArrayList<>(); + private String taskId; + private String procInsId; + private List records = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java index c1478e0bcf..ab5dcb526a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java @@ -86,5 +86,10 @@ public class LoanMonthlyAccrualApplyFallback implements LoanMonthlyAccrualApplyF return null; } + @Override + public ResultBean appDetail(String sid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java index 5c2224a379..8231f622b0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java @@ -90,4 +90,9 @@ public interface LoanMonthlyAccrualApplyFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") public ResultBean delegate(@RequestBody AccrualDelegateQuery query); + + @ApiOperation("月还计提申请移动端详情") + @GetMapping("/appDetail/{sid}") + @ResponseBody + ResultBean appDetail(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/AppTransferPaymentDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/AppTransferPaymentDetailsVo.java new file mode 100644 index 0000000000..8e6ce77532 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/AppTransferPaymentDetailsVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.AppAccrualRecordVo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2023/12/22 9:11 + */ +@Data +public class AppTransferPaymentDetailsVo { + private String sid; + private String publishInfo; + private String time; + private String remarks; + private List files = new ArrayList<>(); + private String taskId; + private String procInsId; + private List records = new ArrayList<>(); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/AppTransferRecordVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/AppTransferRecordVo.java new file mode 100644 index 0000000000..7309518532 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/AppTransferRecordVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.riskcenter.api.loantransferpaymentapply; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/12/22 9:23 + */ +@Data +public class AppTransferRecordVo { + private String contractId; + private String instalments; + private String vin; + private String zf; + private String zfNo; + private String cusName; + private String loanName; + private String actualDate; + private String actualMoney; + private String spread; + private String transferPrincipal; + private String defaultInterest; + private String account; + private String accountNumber; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java index 1141df38be..fd5c41209f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java @@ -92,4 +92,8 @@ public interface LoanTransferPaymentApplyFeign { @PostMapping(value = "/delegate") public ResultBean delegate(@RequestBody TransferDelegateQuery query); + @ApiOperation("代收代付申请移动端详情") + @GetMapping("/appDetail/{sid}") + @ResponseBody + ResultBean appDetail(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java index 2b77067dd5..ddeeca1a69 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java @@ -85,4 +85,9 @@ public class LoanTransferPaymentApplyFeignFallback implements LoanTransferPaymen public ResultBean delegate(TransferDelegateQuery query) { return null; } + + @Override + public ResultBean appDetail(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java index b5212c5b44..d8586cbd1f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java @@ -30,7 +30,7 @@ public class LoanTransferPaymentRecordVo { private String actualMoney; @ApiModelProperty("息差") private String spread; - @ApiModelProperty("转付本金") + @ApiModelProperty("转付资方月还") private String transferPrincipal; @ApiModelProperty("转付罚息") private String defaultInterest; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java index 8f348986ad..c336072aa8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java @@ -99,6 +99,10 @@ public class LoanMonthlyAccrualApplyRest implements LoanMonthlyAccrualApplyFeign return loanMonthlyAccrualApplyService.delegate(query); } + @Override + public ResultBean appDetail(String sid) { + return loanMonthlyAccrualApplyService.appDetail(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java index 44286a7900..22abcffa9b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java @@ -26,11 +26,16 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo; +import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.*; import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*; import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; @@ -830,4 +835,88 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService appDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppMonthAccrualDetailsVo vo = new AppMonthAccrualDetailsVo(); + LoanMonthlyAccrualApply apply = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != apply) { + vo.setSid(sid); + String dept = ""; + String applyName = ""; + if (StringUtils.isNotBlank(apply.getRemarks())) { + vo.setRemarks(apply.getRemarks()); + } + if (StringUtils.isNotBlank(apply.getProcInstId())) { + vo.setProcInsId(apply.getProcInstId()); + } + if (StringUtils.isNotBlank(apply.getTaskId())) { + vo.setTaskId(apply.getTaskId()); + } + if (null != apply.getApplyDate()) { + vo.setTime(sdf.format(apply.getApplyDate())); + } + if (StringUtils.isNotBlank(apply.getDept())) { + dept = apply.getDept(); + } + if (StringUtils.isNotBlank(apply.getApplyName())) { + applyName = apply.getApplyName(); + } + vo.setPublishInfo(dept + "-" + applyName); + List fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.ACCRUALAPPLY.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List files = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setFiles(files); + } + List applyRecords = loanMonthlyAccrualRecordService.selByMainSid(sid); + List records = new ArrayList<>(); + if (!applyRecords.isEmpty()) { + for (LoanMonthlyAccrualRecord applyRecord : applyRecords) { + String recordSid = applyRecord.getRecordSid(); + LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsService.fetchBySid(recordSid); + if (null != data) { + AppAccrualRecordVo appRecordVo = new AppAccrualRecordVo(); + if (StringUtils.isNotBlank(data.getLoanContractNo())) { + appRecordVo.setContractId(data.getLoanContractNo()); + } + if (null != data.getDueDate()) { + appRecordVo.setRepaymentDate(sdf.format(data.getDueDate())); + } + if (StringUtils.isNotBlank(data.getPeriod())) { + appRecordVo.setInstalments("期数：" + data.getPeriod()); + } + if (StringUtils.isNotBlank(data.getVinNo())) { + appRecordVo.setVin("车架号：" + data.getVinNo()); + } + if (StringUtils.isNotBlank(data.getBankName())) { + appRecordVo.setZf(data.getBankName()); + } + if (StringUtils.isNotBlank(data.getBankContractNo())) { + appRecordVo.setZfNo(data.getBankContractNo()); + } + if (StringUtils.isNotBlank(data.getCustomer())) { + appRecordVo.setCusName(data.getCustomer()); + } + if (StringUtils.isNotBlank(data.getBorrowerName())) { + appRecordVo.setLoanName(data.getBorrowerName()); + } + if (null != data.getDueMoney()) { + appRecordVo.setDueMoney(String.valueOf(data.getDueMoney())); + } + if (StringUtils.isNotBlank(data.getBorrowerName())) { + appRecordVo.setLoanName(data.getBorrowerName()); + } + if (StringUtils.isNotBlank(data.getDept())) { + appRecordVo.setDept(data.getDept()); + } + records.add(appRecordVo); + } + } + } + vo.setRecords(records); + } + return rb.success().setData(vo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java index 9d2cc48950..91fc8518bf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java @@ -102,4 +102,9 @@ public class LoanTransferPaymentApplyRest implements LoanTransferPaymentApplyFei return loanTransferPaymentApplyService.delegate(query); } + @Override + public ResultBean appDetail(String sid) { + return loanTransferPaymentApplyService.appDetail(sid); + } + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index 1bbb895036..519901172a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -27,7 +27,12 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.AppAccrualRecordVo; +import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.AppMonthAccrualDetailsVo; +import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApply; +import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.*; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.*; import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord; @@ -823,4 +828,97 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService appDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppTransferPaymentDetailsVo vo = new AppTransferPaymentDetailsVo(); + LoanTransferPaymentApply apply = fetchBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != apply) { + vo.setSid(sid); + String dept = ""; + String applyName = ""; + if (StringUtils.isNotBlank(apply.getRemarks())) { + vo.setRemarks(apply.getRemarks()); + } + if (StringUtils.isNotBlank(apply.getProcInstId())) { + vo.setProcInsId(apply.getProcInstId()); + } + if (StringUtils.isNotBlank(apply.getTaskId())) { + vo.setTaskId(apply.getTaskId()); + } + if (null != apply.getApplyDate()) { + vo.setTime(sdf.format(apply.getApplyDate())); + } + if (StringUtils.isNotBlank(apply.getDept())) { + dept = apply.getDept(); + } + if (StringUtils.isNotBlank(apply.getApplyName())) { + applyName = apply.getApplyName(); + } + vo.setPublishInfo(dept + "-" + applyName); + List fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.TRANSFERPAYMENT.getAttachType()); + fileList.removeAll(Collections.singleton(null)); + if (!fileList.isEmpty()) { + List files = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()). + collect(Collectors.toList()); + vo.setFiles(files); + } + List applyRecords = loanTransferPaymentRecordService.selByMainSid(sid); + List records = new ArrayList<>(); + if (!applyRecords.isEmpty()) { + for (LoanTransferPaymentRecord applyRecord : applyRecords) { + String historySid = applyRecord.getRepaymentHistorySid(); + LoanTransferPaymentRecordVo data = baseMapper.paymentInfo(historySid); + if (null != data) { + AppTransferRecordVo appRecordVo = new AppTransferRecordVo(); + if (StringUtils.isNotBlank(data.getLoanContractNo())) { + appRecordVo.setContractId(data.getLoanContractNo()); + } + if (StringUtils.isNotBlank(data.getPeriod())) { + appRecordVo.setInstalments("期数：" + data.getPeriod()); + } + if (StringUtils.isNotBlank(data.getVinNo())) { + appRecordVo.setVin("车架号：" + data.getVinNo()); + } + if (StringUtils.isNotBlank(data.getBankName())) { + appRecordVo.setZf(data.getBankName()); + } + if (StringUtils.isNotBlank(data.getBankContractNo())) { + appRecordVo.setZfNo(data.getBankContractNo()); + } + if (StringUtils.isNotBlank(data.getCustomer())) { + appRecordVo.setCusName(data.getCustomer()); + } + if (StringUtils.isNotBlank(data.getBorrowerName())) { + appRecordVo.setLoanName(data.getBorrowerName()); + } + if (StringUtils.isNotBlank(data.getActualDate())) { + appRecordVo.setActualDate(data.getActualDate()); + } + if (StringUtils.isNotBlank(data.getActualMoney())) { + appRecordVo.setActualMoney(data.getActualMoney()); + } + if (StringUtils.isNotBlank(data.getSpread())) { + appRecordVo.setSpread(data.getSpread()); + } + if (StringUtils.isNotBlank(data.getTransferPrincipal())) { + appRecordVo.setTransferPrincipal(data.getTransferPrincipal()); + } + if (StringUtils.isNotBlank(data.getDefaultInterest())) { + appRecordVo.setDefaultInterest(data.getDefaultInterest()); + } + if (StringUtils.isNotBlank(data.getAccount())) { + appRecordVo.setAccount(data.getAccount()); + } + if (StringUtils.isNotBlank(data.getAccountNumber())) { + appRecordVo.setAccountNumber(data.getAccountNumber()); + } + records.add(appRecordVo); + } + } + } + vo.setRecords(records); + } + return rb.success().setData(vo); + } } diff --git a/anrui-system-ui/package.json b/anrui-system-ui/package.json index 047fd90d88..d171e1609e 100644 --- a/anrui-system-ui/package.json +++ b/anrui-system-ui/package.json @@ -29,6 +29,7 @@ "viewerjs": "^1.9.0", "vue": "2.6.10", "vue-amap": "^0.5.10", + "vue-monoplasty-slide-verify": "^1.3.1", "vue-router": "3.0.6", "vuex": "3.1.0", "vuex-persistedstate": "^4.0.0", diff --git a/anrui-system-ui/src/api/user.js b/anrui-system-ui/src/api/user.js index 535b7c5f45..0f02ea3a29 100644 --- a/anrui-system-ui/src/api/user.js +++ b/anrui-system-ui/src/api/user.js @@ -9,6 +9,16 @@ export function login(data) { headers: {'Content-Type': 'application/json'} }) } + +export function loginByNoVeriCode(data) { + return request({ + url: '/portal/v1/sysuser/loginByNoVeriCode', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + // 用户注册 export function registUser(data) { return request({ diff --git a/anrui-system-ui/src/main.js b/anrui-system-ui/src/main.js index e95aabe47c..faa5ab71f6 100644 --- a/anrui-system-ui/src/main.js +++ b/anrui-system-ui/src/main.js @@ -4,6 +4,8 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' +import slideVerify from 'vue-monoplasty-slide-verify' +Vue.use(slideVerify) Vue.use(ElementUI) diff --git a/anrui-system-ui/src/store/modules/user.js b/anrui-system-ui/src/store/modules/user.js index 01ddfc7c87..d2f453ee9e 100644 --- a/anrui-system-ui/src/store/modules/user.js +++ b/anrui-system-ui/src/store/modules/user.js @@ -1,4 +1,4 @@ -import { login, logout, getInfo } from '@/api/user' +import { login, logout, getInfo, loginByNoVeriCode } from '@/api/user' import { getStorage, setStorage, removeStorage } from '@/utils/auth' import router, { resetRouter } from '@/router' @@ -25,7 +25,8 @@ const actions = { // user login login({ commit }, userInfo) { return new Promise((resolve, reject) => { - login(userInfo).then(response => { + // login(userInfo).then(response => { + loginByNoVeriCode(userInfo).then(response => { const { data } = response commit('SET_TOKEN', data.token) setStorage(data.token) diff --git a/anrui-system-ui/src/views/login/login.vue b/anrui-system-ui/src/views/login/login.vue index f2c318417a..959aa4add7 100644 --- a/anrui-system-ui/src/views/login/login.vue +++ b/anrui-system-ui/src/views/login/login.vue @@ -27,7 +27,8 @@ trigger="click" v-model="loginCode" @show="codeShow"> - + +