From ec20a63bf95fbc6e1269278f4259ea0769fc6d88 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 26 Jul 2023 17:33:05 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4554440fa8..07e3ea6895 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 @@ -1453,7 +1453,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService= 0) { //已认款完成 BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey()); @@ -1476,7 +1476,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService= 0) { //已认款完成 BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey()); From ecc8f16a29d1f97ab9bb4954de3affbdbafc3347 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 26 Jul 2023 17:56:12 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyFeign.java | 7 +- ...FundsCarriedForwardApplyFeignFallback.java | 5 ++ .../FinFundsCarriedForwardApplyVo.java | 6 +- .../FinFundsCarriedForwardApplyRest.java | 5 ++ .../FinFundsCarriedForwardApplyService.java | 73 ++++++++++++++++++- 5 files changed, 93 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java index 881220a69b..de454329ef 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeign.java @@ -94,11 +94,16 @@ public interface FinFundsCarriedForwardApplyFeign { @ResponseBody public ResultBean init(@RequestBody FinFundsCarriedForwardApplyInitQuery finFundsCarriedForwardApplyInitQuery); - @ApiOperation("生成款项结转PDF") + @ApiOperation("生成款项结转PDF(PC)") @PostMapping("/createPdf") @ResponseBody public ResultBean createPdf(@RequestParam("sid") String sid, @RequestParam("pdfType") String pdfType); + @ApiOperation("生成款项结转PDF(APP)") + @PostMapping("/createPdf2") + @ResponseBody + public ResultBean createPdf2(@RequestParam("sid") String sid, @RequestParam("pdfType") String pdfType); + /****************************************************审批流程*****************************************************/ @ApiOperation("款项结转审批流程") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java index fdb451cf55..fc9afb8980 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyFeignFallback.java @@ -87,6 +87,11 @@ public class FinFundsCarriedForwardApplyFeignFallback implements FinFundsCarried return null; } + @Override + public ResultBean createPdf2(String sid, String pdfType) { + return null; + } + @Override public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java index bd6694e725..144b89c87d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java @@ -26,12 +26,15 @@ package com.yxt.anrui.fin.api.finfundscarriedforwardapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-fin(款项结转申请)
* File: FinFundsCarriedForwardApplyVo.java
@@ -59,7 +62,8 @@ public class FinFundsCarriedForwardApplyVo implements Vo { @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("申请日期") - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("来源") private String source; @ApiModelProperty("结转金额") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java index d01c47a948..19cc661f10 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java @@ -109,6 +109,11 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp return finFundsCarriedForwardApplyService.createPdf(sid,userName); } + @Override + public ResultBean createPdf2(String sid, String pdfType) { + return finFundsCarriedForwardApplyService.createPdf2(sid,pdfType); + } + @Override public ResultBean submitFinFundsApply(SubmitFinFundsApplyDto dto) { return finFundsCarriedForwardApplyService.submitFinFundsApply(dto); 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 4554440fa8..e2b8cb8f6b 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 @@ -229,7 +229,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw, query.getJzSmallMoney(), query.getJzBigMoney()); for (FinFundsCarriedForwardApplyVo record : pagging.getRecords()) { record.setShowUpdateBtn(false); - if (StringUtils.isNotBlank(record.getDownloadUrl())) { + if ("已办结".equals(record.getNodeState())) { record.setShowDownloadBtn(true); } else { record.setShowDownloadBtn(false); @@ -1509,4 +1509,75 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService createPdf2(String sid, String pdfType) { + ResultBean rb = ResultBean.fireFail(); + FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData(); + List finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos(); + List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + Map dataMap = new HashMap(); + if (StringUtils.isNotBlank(data.getProcInsId())) { + List flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInsId(), "1").getData(); + if (flowRecordVo != null) { + for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + if (flowTask.getFlowableRecordVo() != null) { + Map flowableRecordVo = flowTask.getFlowableRecordVo(); + String taskDefKey = (String) flowableRecordVo.get("taskDefKey"); + List> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); + String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); + String finishTime = (String) flowableRecordVo.get("finishTime"); + finishTime = finishTime.substring(0, 10); + if ("Activity_17mi28e".equals(taskDefKey)) { + dataMap.put("spName", assigneeName + finishTime); + } + } + } + } + } + List tzList = new ArrayList<>(); + for (FinFundsCarriedForwardVehDetailsVo finFundsCarriedForwardVehDetailsVo : finFundsCarriedForwardVehDetailsVos) { + TzDto tzDto = new TzDto(); + tzDto.setTzType("转出"); + tzDto.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo()); + tzDto.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName()); + tzDto.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo()); + String thisUseMoney = finFundsCarriedForwardVehDetailsVo.getThisUseMoney(); + int index = thisUseMoney.indexOf("."); + tzDto.setDcje(Integer.parseInt(thisUseMoney.substring(0, index))); + tzList.add(tzDto); + } + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + TzDto tzDto = new TzDto(); + tzDto.setTzType("转入"); + tzDto.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId()); + tzDto.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName()); + tzDto.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin()); + tzDto.setDrje(Integer.parseInt(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + tzList.add(tzDto); + } + dataMap.put("saleDate", DateUtil.formatDate(new Date())); + dataMap.put("billNo", data.getBillNo()); + dataMap.put("tzList", tzList); + dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate()); + //获取模板 + //模板路径 + String sourcePath = "D:\\anrui\\upload\\template\\"; + //生成word文件名 + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + // 生成文件路径 + String targetPath = sourcePath + dateStr; + if (pdfType.equals("针孔式打印机")) { + WordUtils.creatWord(dataMap, "jzsqzks", sourcePath, targetPath, typeName); + } else if (pdfType.equals("激光打印机")) { + WordUtils.creatWord(dataMap, "jzsqjg", sourcePath, targetPath, typeName); + } + //新生成的word路径 + String wordPath = targetPath + "\\" + typeName; + //生成出门证文件名 + String pdfName = "款项结转_" + dateStr + seconds + ".pdf"; + WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); + return rb.success().setData(fileUploadComponent.getUrlPrefix() + "/template/" + dateStr + "/" + pdfName); + } } \ No newline at end of file From 3605de1a036ee779099f8adfce7448a5114a5112 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 27 Jul 2023 08:36:35 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=85=E5=87=BA?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleStateEnum.java | 2 + .../BaseVehicleStateService.java | 6 + .../biz/busdelivered/BusDeliveredMapper.java | 3 +- .../biz/busdelivered/BusDeliveredMapper.xml | 71 +++-- .../biz/busdelivered/BusDeliveredRest.java | 6 +- .../biz/busdelivered/BusDeliveredService.java | 104 ++++-- .../BusDeliveredApplyService.java | 295 ++++++++++++++---- .../BusSalesOrderVehicleMapper.java | 1 + .../BusSalesOrderVehicleMapper.xml | 9 + .../BusSalesOrderVehicleService.java | 4 + .../FinCollectionConfirmationService.java | 6 +- .../FinSelectedReceivablesDetailedMapper.xml | 2 +- ...inUncollectedReceivablesDetailedMapper.xml | 2 +- 13 files changed, 407 insertions(+), 104 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java index fe2aeac54e..5231bed542 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java @@ -71,6 +71,8 @@ public class BaseVehicleStateEnum { DDBA_SAVEVIN("6", "录入车架号"), FIN_RQ("7", "认款完成"), FIN_WRQ("8", "认款未完成"), + CKTJ("9", "出库提交"), + CKZZ("10", "出库终止、驳回以及撤回到第一环节时"), ; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 0ee5988d61..cefaf8c2ae 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -61,6 +61,12 @@ public class BaseVehicleStateService extends MybatisBaseService { List selectByState(); - IPage selectListsVos(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + IPage selectListsVoNew(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); IPage getRetrievalNotLists(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("name") String name); + IPage getRetrievalNotListNew(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw, @Param("name") String name); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index ded95acff0..939d1d4048 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -155,24 +155,6 @@ and finState = '1' - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java index c6f0fdf7ff..d828aaf2bd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java @@ -68,7 +68,7 @@ public class BusDeliveredRest implements BusDeliveredFeign { @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = busDeliveredService.listPageVo(pq); + PagerVo pv = busDeliveredService.listPageVoNew(pq); return rb.success().setData(pv); } @@ -102,7 +102,7 @@ public class BusDeliveredRest implements BusDeliveredFeign { @Override public ResultBean> getRetrievalNotList(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - IPage voIPage = busDeliveredService.getRetrievalNotList(pq); + IPage voIPage = busDeliveredService.getRetrievalNotListNew(pq); return rb.success().setData(voIPage); } @@ -118,7 +118,7 @@ public class BusDeliveredRest implements BusDeliveredFeign { @Override public ResultBean> selectInfo(DeliverDetailsQuery query) { - return busDeliveredService.selectInfo(query); + return busDeliveredService.selectInfoNew(query); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 5df7bed883..ea6081801a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -160,23 +160,17 @@ public class BusDeliveredService extends MybatisBaseService listPageVos(PagerQuery pq) { + public PagerVo listPageVoNew(PagerQuery pq) { BusDeliveredQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); if (query != null) { //合同编号 if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("bd.contractNo", query.getContractNo()); + qw.like("bo.contractNo", query.getContractNo()); } //客户名称 if (StringUtils.isNotBlank(query.getName())) { - qw.like("bd.name", query.getName()); + qw.like("bo.name", query.getName()); } //车架号 if (StringUtils.isNotBlank(query.getVinNo())) { @@ -187,20 +181,15 @@ public class BusDeliveredService extends MybatisBaseService busVinSidList = baseMapper.selectByState(); - //查询销售订单中申请人是当前登录人且已办结的，linkSid有值，且在车辆台账中不为出库的。 IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectListsVos(page, qw); + IPage pagging = baseMapper.selectListsVoNew(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(BusDeliveredDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { @@ -271,7 +260,26 @@ public class BusDeliveredService extends MybatisBaseService getRetrievalNotLists(PagerQuery pq) { + public IPage getRetrievalNotListNew(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + String name = pq.getParams().getName(); + IPage page = PagerUtil.queryToPage(pq); + String orgPath = pq.getParams().getOrgPath(); + String orgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } else { + orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); + } + qw.eq("bo.useOrgSid", orgSid); + if (StringUtils.isNotBlank(pq.getParams().getUserSid())) { + qw.eq("bo.createBySid", pq.getParams().getUserSid()); + } + IPage iPage = baseMapper.getRetrievalNotListNew(page, qw, name); + return iPage; + } + + /* public IPage getRetrievalNotLists(PagerQuery pq) { QueryWrapper qw = new QueryWrapper<>(); String name = pq.getParams().getName(); IPage page = PagerUtil.queryToPage(pq); @@ -298,7 +306,7 @@ public class BusDeliveredService extends MybatisBaseService getRetrievalApplyInfo(AppDeliveredDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); @@ -408,7 +416,7 @@ public class BusDeliveredService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(vinSid, contractNo); - if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { + if (trailerList.getData() != null && trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { appCarListVo.setShowHandCarBtn(false); } else { appCarListVo.setShowHandCarBtn(true); @@ -694,6 +702,64 @@ public class BusDeliveredService extends MybatisBaseService> selectInfoNew(DeliverDetailsQuery query) { + ResultBean> rb = ResultBean.fireFail(); + //移动端：排除已选车辆后的所有未提交及未出库的车辆集合 + //PC端：前端传的已勾选的所有的车辆的集合 + String contractNo = query.getContractNo(); + List vinSelectSid = query.getVinSelectsid(); + vinSelectSid.removeAll(Collections.singleton(null)); + List vinSids = query.getVinSids(); + vinSids.removeAll(Collections.singleton(null)); + List list = new ArrayList<>(); + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSidsNew(contractNo); + for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { + AppCarListVo appCarListVo = new AppCarListVo(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i); + String vinSid = busSalesOrderVehicle.getLinkSid(); + if (!vinSelectSid.isEmpty()) { + if (vinSelectSid.contains(vinSid)) { + continue; + } + } + if (!vinSids.isEmpty()) { + if (vinSids.contains(vinSid)) { + appCarListVo.setVinSid(vinSid); + } else { + continue; + } + } else { + appCarListVo.setVinSid(vinSid); + } + ResultBean trailerList = baseTrailerFeign.trailerList(vinSid, query.getContractNo()); + if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { + appCarListVo.setShowHandCarBtn(false); + } else { + appCarListVo.setShowHandCarBtn(true); + } + //优惠包使用情况 + List discountList = new ArrayList<>(); + List busSalesOrderDiscountList = busSalesOrderDiscountService.selectListByContractNo(contractNo); + for (int j = 0; j < busSalesOrderDiscountList.size(); j++) { + BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo(); + BusSalesOrderDiscount orderDiscountVo = busSalesOrderDiscountList.get(j); + busDeliveredDetailsDiscountsVo.setDiscountInfo(orderDiscountVo.getDiscountExplain()); + busDeliveredDetailsDiscountsVo.setDiscountSid(orderDiscountVo.getSid()); + busDeliveredDetailsDiscountsVo.setDiscountPrice(orderDiscountVo.getPrice()); + busDeliveredDetailsDiscountsVo.setDiscountNum(0); + busDeliveredDetailsDiscountsVo.setTotalNum(orderDiscountVo.getNum()); + busDeliveredDetailsDiscountsVo.setDiscountName(orderDiscountVo.getName()); + discountList.add(busDeliveredDetailsDiscountsVo); + } + appCarListVo.setDiscountUse(discountList); + BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo(); + deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8)); + appCarListVo.setRealBuyer(deliveredUseMessagesVo); + list.add(appCarListVo); + } + return rb.success().setData(list); + } + public BusDelivered getState(String contractNo, String vinSid) { return baseMapper.getState(contractNo,vinSid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 53452e525d..06d01a6726 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -42,6 +42,9 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; @@ -213,6 +216,8 @@ public class BusDeliveredApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + List stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + stringList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_PASS.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); @@ -836,10 +866,34 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid()); - for (int i = 0; i < stringList.size(); i++) { + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + stringList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + /*for (int i = 0; i < stringList.size(); i++) { String vinNo = stringList.get(i); busDeliveredService.updateState(vinNo, 0); - } + }*/ //更改申请的状态为待审核2 baseMapper.updateStateBySid(2, bv.getBusinessSid()); } @@ -1378,7 +1432,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } baseMapper.updateStateBySid(1, query.getBusinessSid()); } //极光推送 @@ -1477,7 +1555,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } baseMapper.updateStateBySid(1, query.getBusinessSid()); } @@ -1516,7 +1618,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -1530,7 +1656,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } return rb.success().setData(resultBean.getData()); } } @@ -1720,6 +1870,9 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); //更新该合同的该车架号的状态为0 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); + //更新出库申请的状态为待审核2 baseMapper.updateStateBySid(2, sid); - //极光推送 busDeliveredApply = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("出库申请"); - messageFlowableQuery.setMsgContent(busDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("出库申请"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply = busDeliveredApply; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("出库申请"); + messageFlowableQuery.setMsgContent(finalBusDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("出库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + return voResultBean; } if (r == 2) { @@ -2219,7 +2413,31 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid); //更新该合同的该车架号的状态为0 - busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); +// busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 0); + //==============================新增车辆的持久状态组装数据 + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply; + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } //更新出库申请的状态为待审核2 baseMapper.updateStateBySid(2, sid); return complete(bv); @@ -2315,43 +2533,4 @@ public class BusDeliveredApplyService extends MybatisBaseService getRetrievalDetail(String contractSid) { -// ResultBean rb = ResultBean.fireFail(); -// AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo(); -// BusDeliveredApply busDeliveredApply = fetchBySid(contractSid); -// BeanUtils.copyProperties(busDeliveredApply,vo); -// -// if (vo.getIsTerminal().equals(1)) { -// List voList = busDeliveredApplyDetailsService.appDetailsList(contractSid); -// voList.removeAll(Collections.singleton(null)); -// if (!voList.isEmpty()) { -// for (AppCarListVo v : voList) { -// CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData(); -// AppUseInfoVo appUseInfoVo = new AppUseInfoVo(); -// appUseInfoVo.setMobile(data.getMobile()); -// appUseInfoVo.setCustomer(data.getName()); -// appUseInfoVo.setAddress(data.getAddress()); -// appUseInfoVo.setIdNumber(data.getIDNumber()); -// v.setUseInfo(appUseInfoVo); -// } -// } -// vo.setCarList(voList); -// -// } else if (vo.getIsTerminal().equals(0)) { -// //根据出库申请单的sid查询需要出库的车辆信息 -// List voList = busDeliveredApplyDetailsService.appDetailsList(contractSid); -// for (int i = 0; i < voList.size(); i++) { -// BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid()); -// AppUseInfoVo appUseInfoVo = new AppUseInfoVo(); -// appUseInfoVo.setMobile(busDeliveredUseMessage.getMobile()); -// appUseInfoVo.setCustomer(busDeliveredUseMessage.getName()); -// appUseInfoVo.setAddress(busDeliveredUseMessage.getAddress()); -// appUseInfoVo.setIdNumber(busDeliveredUseMessage.getIdNo()); -// voList.get(i).setUseInfo(appUseInfoVo); -// } -// vo.setCarList(voList); -// } -// return rb.success().setData(vo); -// } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 8faf3f54f3..9fcee45478 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -114,6 +114,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectByNoAndVinSids(String contractNo); + List selectByNoAndVinSidsNew(String contractNo); List appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 63d72d8b54..8832a83802 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -98,6 +98,15 @@ and length(bv.linkSid) > 0 + + 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 8dcf61c327..12fde0097c 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 @@ -93,7 +93,7 @@ ${ew.sqlSegment} and length(furd.busVinSid) > 0 - group by furd.sid,currentReceivableMoney,furd.contractNo + group by furd.sid,currentReceivableMoney>0,furd.contractNo having currentReceivableMoney>0 order by furd.contractNo desc From 0108bc35c7b321370c19c0db81fb0a212b2faba1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 27 Jul 2023 08:51:35 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 5242e752fb..ee379c014d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -363,7 +363,7 @@ left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid ${ew.sqlSegment} - and fd.receivablesName != '订金' + and fd.receivablesName not like '%订金%' and fd.auditState = 3 and concat(IFNULL(fd.customerName @@ -498,7 +498,7 @@ ) df ON df.receivablesSid = furd.`sid` ${ew.sqlSegment} - and fd.receivablesName != '订金' + and fd.receivablesName not like '%订金%' and fd.auditState = 3 and concat(IFNULL(fd.customerName From a62ec203320cf00f22791d1188360cfafa094b4c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 27 Jul 2023 09:00:52 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehiclestate/BaseVehicleState.java | 2 ++ .../basevehiclestate/BaseVehicleStateDto.java | 4 ++++ .../biz/bussalesorder/BusSalesOrderService.java | 16 ++++++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java index eaef7640e7..e3b4e4402a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java @@ -36,6 +36,8 @@ public class BaseVehicleState extends BaseEntity { private String packageBusiness; @ApiModelProperty("合同状态") private String contractState; + private String saleTypeKey; + private String finSourceKey; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java index 8f61d8d56c..8dc5163630 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateDto.java @@ -21,4 +21,8 @@ public class BaseVehicleStateDto implements Dto { private String busSid; @ApiModelProperty("操作类型") private String operateType; + @ApiModelProperty("销售类型：1全款，2贷款") + private String saleTypeKey; + @ApiModelProperty("款项来源：1自有资金、2三方金融、3担保、4非担保") + private String finSourceKey; } 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 11aa22963a..e95a9d5bb4 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 @@ -4775,9 +4775,9 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(businessSid); - AppOrderDetailsVo vo = resultBean.getData(); - if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { + /* ResultBean resultBean = getSaleOrderDetails(businessSid); + AppOrderDetailsVo vo = resultBean.getData();*/ + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) { //更新已选择的车架号的状态为审批中 List list = busSalesOrderVehicleService.selectVehicleSid(businessSid); BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); @@ -4798,12 +4798,14 @@ public class BusSalesOrderService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusSalesOrder finalBusSalesOrderOne = busSalesOrderOne; Future future1 = pool.submit(() -> { List dtoList = new ArrayList<>(); List vehicleList = busSalesOrderVehicleService.selectListByOrderSid(businessSid); @@ -4816,6 +4818,8 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(businessSid); - AppOrderDetailsVo vo = resultBean.getData(); - if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { + /* ResultBean resultBean = getSaleOrderDetails(businessSid); + AppOrderDetailsVo vo = resultBean.getData();*/ + if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) { //更新已选择的车架号的状态为审批中 List list = busSalesOrderVehicleService.selectVehicleSid(businessSid); BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); From 08c160204d087b59a1db8a1ec7b872c874671221 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Jul 2023 09:25:58 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 dad44478e4..626dfbf567 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 @@ -577,19 +577,24 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService Date: Thu, 27 Jul 2023 09:58:11 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdelivered/BusDeliveredService.java | 2 - .../busmaindeposit/BusMainDepositService.java | 198 +++++++++++++----- .../FinCollectionConfirmationService.java | 27 +++ 3 files changed, 178 insertions(+), 49 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index ea6081801a..a4aebe9f04 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -413,7 +413,6 @@ public class BusDeliveredService extends MybatisBaseService trailerList = baseTrailerFeign.trailerList(vinSid, contractNo); if (trailerList.getData() != null && trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { @@ -609,7 +608,6 @@ public class BusDeliveredService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); + ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 busMainDeposit = fetchBySid(businessSid); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - ufVo.setProcInsId(busMainDeposit.getProcInsId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("简易订单-订金申请"); - messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("简易订单"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusMainDeposit finalBusMainDeposit = busMainDeposit; + Future future1 = pool.submit(() -> { + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcInsId(finalBusMainDeposit.getProcInsId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("简易订单-订金申请"); + messageFlowableQuery.setMsgContent(finalBusMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("简易订单"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + return voResultBean; } if (r == 2) { @@ -1370,40 +1387,45 @@ public class BusMainDepositService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); - try { - ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() - .setNameFormat("demo-pool-%d").build(); - ExecutorService pool = new ThreadPoolExecutor(2, 100, - 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - Future future1 = pool.submit(() -> { - //更新已选择的车架号的状态为审批中 - List list = dto.getCarList().stream().map(AppBusDepositVehicleCarListDto::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); - BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); - busMainDepositUpdateQuery.setVinSidList(list); - busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode()); - busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks()); - baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); - }); - Future future2 = pool.submit(() -> { - //极光推送 - busMainDeposit.set(fetchBySid(businessSid)); - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - ufVo.setProcInsId(busMainDeposit.get().getProcInsId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("简易订单-订车申请"); - messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("简易订单"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - }); + if ("Event_end".equals(ufVo.getTaskDefKey())) { + pushFin(businessSid); + }else{ + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + //更新已选择的车架号的状态为审批中 + List list = dto.getCarList().stream().map(AppBusDepositVehicleCarListDto::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); + busMainDepositUpdateQuery.setVinSidList(list); + busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode()); + busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks()); + baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + }); + Future future2 = pool.submit(() -> { + //极光推送 + busMainDeposit.set(fetchBySid(businessSid)); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcInsId(busMainDeposit.get().getProcInsId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("简易订单-订车申请"); + messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("简易订单"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } } + return voResultBean; } if (r == 2) { @@ -1465,7 +1487,7 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } else { - //更新修改时间 + /*//更新修改时间 baseMapper.updateModify(new Date(), bv.getBusinessSid()); //如果类型为订金，推送款项确认 if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { @@ -1541,7 +1563,8 @@ public class BusMainDepositService extends MybatisBaseService orgList = Arrays.asList(busMainDeposit.getOrgSidPath().split("/")); + String deptSid = orgList.get(orgList.size() - 1); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid); + if (sysOrganizationVoResultBean.getData() != null) { + finConfirmDto.setCreateDept(sysOrganizationVoResultBean.getData().getName()); + finConfirmDto.setCreateDeptSid(deptSid); + } + //申请日期 + finConfirmDto.setCreateDate(DateUtil.today()); + //收款账户名称 + finConfirmDto.setReceivingName(busDeposit.getCollectionAccountName()); + //付款账号后4位 + finConfirmDto.setPayAccount(busDeposit.getPayBankAcc()); + //付款银行 + finConfirmDto.setPayBank(busDeposit.getDepositBank()); + finConfirmDto.setPurchaseSystemName(busDeposit.getPurchaseSystemName()); + finConfirmDto.setPurchaseSystemSid(busDeposit.getPurchaseSystemSid()); + ResultBean codeString = finCollectionConfirmationFeign.getApplyCode(busMainDeposit.getOrgSid()); + finConfirmDto.setBillNo(codeString.getData()); + finConfirmDto.setStaffName(busDeposit.getStaffName()); + finConfirmDto.setStaffUserSid(busMainDeposit.getCreateBySid()); + finConfirmDto.setStaffDeptName(finConfirmDto.getCreateDept()); + finConfirmDto.setStaffDeptSid(finConfirmDto.getCreateDeptSid()); + finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto); + } + if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { + //更新已选择的车架号的状态为简易订单锁定 + AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(businessSid).getData(); + List list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); + busMainDepositUpdateQuery.setVinSidList(list); + busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.LOCK.getCode()); + busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.LOCK.getRemarks()); + baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + } + } + /** * 判断提交的流程是否被允许 * diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 85e2463390..25c6df822f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1207,6 +1207,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Thu, 27 Jul 2023 10:22:13 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busmaindeposit/BusMainDepositService.java | 49 ++++++++++--------- .../FinCollectionConfirmationService.java | 5 ++ .../FinFundsCarriedForwardApplyService.java | 37 +++++++------- 3 files changed, 51 insertions(+), 40 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 2fd051ccfe..9ea4da66a6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1223,30 +1223,33 @@ public class BusMainDepositService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - BusMainDeposit finalBusMainDeposit = busMainDeposit; - Future future1 = pool.submit(() -> { - MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); - MessageFlowVo messageFlowVo = new MessageFlowVo(); - BeanUtil.copyProperties(ufVo, messageFlowVo); - ufVo.setProcInsId(finalBusMainDeposit.getProcInsId()); - messageFlowableQuery.setUfVo(messageFlowVo); - messageFlowableQuery.setAppMap(appMap); - messageFlowableQuery.setBusinessSid(businessSid); - messageFlowableQuery.setModuleName("简易订单-订金申请"); - messageFlowableQuery.setMsgContent(finalBusMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); - messageFlowableQuery.setMsgTitle("简易订单"); - ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); - }); - } catch (Exception e) { - e.printStackTrace(); + if ("Event_end".equals(ufVo.getTaskDefKey())) { + pushFin(businessSid); + }else{ + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + BusMainDeposit finalBusMainDeposit = busMainDeposit; + Future future1 = pool.submit(() -> { + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcInsId(finalBusMainDeposit.getProcInsId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("简易订单-订金申请"); + messageFlowableQuery.setMsgContent(finalBusMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("简易订单"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } } - return voResultBean; } if (r == 2) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 25c6df822f..62bfbd3cb0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -2588,6 +2588,8 @@ public class FinCollectionConfirmationService 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(StringUtils.isNotBlank(finSelectedReceivablesDetailed.getReceivablesSid())){ + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); + //结转金额 + //查询该车的所有认款，是否都已认完 + 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); + } } + } } List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectByOneCollSid(sid); From cca7567219eaeea9703ede244c39bc69a5a44a76 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Jul 2023 10:35:30 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationJYDDKYDJVo.java | 4 ++++ .../FinFundsCarriedForwardApplyQuery.java | 2 ++ .../FinCollectionConfirmationMapper.xml | 2 ++ .../FinCollectionConfirmationService.java | 3 ++- .../FinFundsCarriedForwardApplyService.java | 9 ++++++++- .../LoanPreloanCreditApplyService.java | 1 + .../api/risk/creditreview/CreditReviewFeign.java | 5 +++++ .../api/risk/creditreview/CreditReviewFeignFallback.java | 5 +++++ .../terminal/biz/risk/creditreview/CreditReviewRest.java | 5 +++++ .../biz/risk/creditreview/CreditReviewService.java | 7 +++++++ 10 files changed, 41 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java index 3ab0c5048b..d492e00b47 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java @@ -72,4 +72,8 @@ public class FinCollectionConfirmationJYDDKYDJVo implements Vo { private String collectionMoney; @ApiModelProperty("余额") private String balance; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java index 9d585bf57f..9b1c2df1a4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyQuery.java @@ -63,6 +63,8 @@ public class FinFundsCarriedForwardApplyQuery implements Query { private String jzSmallMoney; @ApiModelProperty("最大结转金额") private String jzBigMoney; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("组织全路径") private String orgSidPath; private String menuUrl; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 48a3fe8816..ec7a8d03c8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -211,6 +211,8 @@ bd.`draweeMobile` AS phone, fcc.collectionDate, fcc.collectionMoney, + fsrd.purchaseSystemSid, + fsrd.purchaseSystemName, ( fcc.collectionMoney - COALESCE(SUM(ffc.`thisUseMoney`), 0) ) AS balance diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 85e2463390..28ea844198 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1900,7 +1900,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid()); if (busDeliveredResultBean.getData() == null) { if (leftAll.compareTo(rightAll) <= 0) {//推送待出库 @@ -2796,6 +2796,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService= date_format('" + applyStartDate + "','%Y-%m-%d')"). @@ -385,7 +388,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService idCardImages1 = loanPreloanCreditPeo.getIdCardImages(); for (String s : idCardImages1) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java index 71d77d8734..3f052da630 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java @@ -54,6 +54,11 @@ public interface CreditReviewFeign { @ResponseBody public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto); + @ApiOperation("提交贷前信用审核申请") + @PostMapping("/submitCreditReviewInfo") + @ResponseBody + public ResultBean submitCreditReviewInfo(@RequestBody CreditReviewDto dto); + @ApiOperation("保存贷前信用审核申请1") @PostMapping("/saveCreditReviewInfo1") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java index af7ecb9c00..242d9782b6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java @@ -45,6 +45,11 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { return null; } + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return null; + } + @Override public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java index af847b486c..058d272210 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java @@ -54,6 +54,11 @@ public class CreditReviewRest implements CreditReviewFeign { return creditReviewService.saveCreditReviewInfo(dto); } + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return creditReviewService.submitCreditReviewInfo(dto); + } + @Override public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index 13da1d4a0d..75da0866d8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -257,10 +257,15 @@ public class CreditReviewService { loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto); } loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos); + loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages()); loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto); return rb.success(); } + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return null; + } + public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { ResultBean rb = ResultBean.fireFail(); LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto(); @@ -300,4 +305,6 @@ public class CreditReviewService { //loanPreloanCreditApplyFeign.save() return null; } + + } From ab49c10d9076ffab6a0798eecfbc17ab7c4dff12 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 27 Jul 2023 10:59:09 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 16 ++++++++-------- .../biz/busmaindeposit/BusMainDepositMapper.java | 2 ++ .../biz/busmaindeposit/BusMainDepositMapper.xml | 4 ++++ .../busmaindeposit/BusMainDepositService.java | 6 ++++++ .../BusSalesOrderDepositService.java | 3 +++ 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 06d01a6726..5fe36cfe97 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -795,10 +795,10 @@ public class BusDeliveredApplyService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); Future future1 = pool.submit(() -> { List dtoList = new ArrayList<>(); - List stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid()); - stringList.removeAll(Collections.singleton(null)); - if (!stringList.isEmpty()) { - stringList.stream().forEach(v -> { + List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid()); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_PASS.getTypeKey()); baseVehicleStateDto.setBusSid(v); @@ -865,7 +865,7 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid()); + List vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid()); //==============================新增车辆的持久状态组装数据 try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() @@ -876,9 +876,9 @@ public class BusDeliveredApplyService extends MybatisBaseService { List dtoList = new ArrayList<>(); - stringList.removeAll(Collections.singleton(null)); - if (!stringList.isEmpty()) { - stringList.stream().forEach(v -> { + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + vinSidList.stream().forEach(v -> { BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey()); baseVehicleStateDto.setBusSid(v); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java index c4f0b763c5..1f8a4d9dae 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java @@ -139,4 +139,6 @@ public interface BusMainDepositMapper extends BaseMapper { String selectNum(String bill); int updateModify(@Param("date") Date date, @Param("sid") String businessSid); + + String selectUseMainMoney(String busMainSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index 9ea8b80b51..79c88b5ed3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -381,4 +381,8 @@ set modifyTime = #{date} where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 9ea4da66a6..3550c5e1ef 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1879,4 +1879,10 @@ public class BusMainDepositService extends MybatisBaseService getListByOrderSid(String saleOrderSid) { return baseMapper.getListByOrderSid(saleOrderSid); } + + + } \ No newline at end of file From bb22bcace0962326b05ae11f16888266673f73e9 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 27 Jul 2023 11:08:40 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/busmaindeposit/BusMainDepositService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 3550c5e1ef..56f0a55ae5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1882,7 +1882,7 @@ public class BusMainDepositService extends MybatisBaseService Date: Thu, 27 Jul 2023 11:34:35 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyService.java | 48 +-- .../OtherReceivableBillService.java | 9 + .../otherreceivablebill/data_model.json | 8 +- .../creditreview/CreditReviewService.java | 45 ++- .../款项结转打印模板/jzsqjg.ftl | 334 ++++++++++++++---- .../款项结转打印模板/jzsqzks.ftl | 288 +++++++++++++-- .../款项结转模板(激光打印机).doc | Bin 21504 -> 22528 bytes .../款项结转模板(针式打印机).doc | Bin 19456 -> 20992 bytes 8 files changed, 604 insertions(+), 128 deletions(-) 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 e4969230cc..2fef733a1c 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 @@ -215,8 +215,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService manyHB(List list) { //转出为多条，转入为一条 List manyRemoveList = new ArrayList<>(); - if (list.get(0).getTzType().equals("转出")){ + if (list.get(0).getTzType().equals("转出")) { list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> { transfer.stream().reduce((a, b) -> new TzDto( a.getTzType(), @@ -902,7 +902,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> { transfer.stream().reduce((a, b) -> new TzDto( a.getTzType(), @@ -1054,11 +1054,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService map = BeanUtil.beanToMap(ufVo); //更新业务中的流程相关的参数 updateFlowFiled(map); - if ("发起申请".equals(ufVo.getNodeState())){ + if ("发起申请".equals(ufVo.getNodeState())) { FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData(); List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { - finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid()); + finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid()); } } //极光推送 @@ -1106,11 +1106,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { - finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid()); + finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid()); } } return rb.success().setData(resultBean.getData()); @@ -1145,7 +1145,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { - finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid()); + finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid()); } return rb.success().setData(resultBean.getData()); } else { @@ -1161,7 +1161,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { - finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid()); + finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid()); } } } @@ -1170,7 +1170,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService orgPathList = Arrays.asList(finFundsCarriedForwardApply.getOrgSidPath().split("/")); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); if (sysOrganization == null) { @@ -1197,7 +1197,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectByOneCollSid(sid); finSelectedReceivablesDetailedVos.removeAll(Collections.singleton(null)); - if(!finSelectedReceivablesDetailedVos.isEmpty()){ - for(FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos){ + if (!finSelectedReceivablesDetailedVos.isEmpty()) { + for (FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos) { FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid()); //查询该车的所有认款，是否都已认完 String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); @@ -1571,6 +1571,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService collectionDetails = otherReceivable.getCollectionDetails() == null ? new ArrayList<>() : otherReceivable.getCollectionDetails(); //准备 物料列表的数据 ResultBean>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json index 165f51445d..8dae9a5ec6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json @@ -5,7 +5,7 @@ }, "FBillNo": "@KD_FBillNo", "FDATE": "@KD_FDATE", - "FENDDATE_H": "@KD_FDATE", + "FENDDATE_H": "@KD_FENDDATE_H", "FISINIT": "false", "FCONTACTUNITTYPE": "BD_Customer", "FCONTACTUNIT": { @@ -16,7 +16,7 @@ "FNumber": "PRE001" }, "FDEPARTMENTID": { - "FNumber": "" + "FNumber": "@KD_FDEPARTMENTID" }, "FSETTLEORGID": { "FNumber": "@KD_FSETTLEORGID" @@ -25,10 +25,10 @@ "FNumber": "@KD_FPAYORGID" }, "FSALEDEPTID": { - "FNumber": "" + "FNumber": "@KD_FSALEDEPTID" }, "FSALEORGID": { - "FNumber": "" + "FNumber": "@KD_FSALEORGID" }, "FSALEGROUPID": { "FNumber": "" diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index 75da0866d8..3c1f56c646 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -263,7 +263,50 @@ public class CreditReviewService { } public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { - return null; + ResultBean rb = ResultBean.fireFail(); + LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto(); + loanPreloanCreditApplyDto.setSid(dto.getSid()); + loanPreloanCreditApplyDto.setCreateBySid(dto.getUserSid()); + String[] publishInfos = dto.getPublishInfo().split("-"); + loanPreloanCreditApplyDto.setApplyDeptName(publishInfos[0]); + loanPreloanCreditApplyDto.setCreateByName(publishInfos[1]); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData(); + loanPreloanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid()); + loanPreloanCreditApplyDto.setModelSid(dto.getModelSid()); + loanPreloanCreditApplyDto.setModelName(dto.getModel()); + loanPreloanCreditApplyDto.setCustTypeKey(dto.getCustomerTypeKey()); + loanPreloanCreditApplyDto.setCustTypeValue(dto.getCustomerType()); + loanPreloanCreditApplyDto.setQySid(dto.getCompanySid()); + loanPreloanCreditApplyDto.setQyName(dto.getCompanyName()); + loanPreloanCreditApplyDto.setIdCard(dto.getLegalPersonIdNumber()); + loanPreloanCreditApplyDto.setCustSid(dto.getLegalPersonSid()); + loanPreloanCreditApplyDto.setCustName(dto.getLegalPersonName()); + loanPreloanCreditApplyDto.setPhone(dto.getLegalPersonMobile()); + loanPreloanCreditApplyDto.setCapitalSid(dto.getManagementSid()); + loanPreloanCreditApplyDto.setCapitalName(dto.getManagementName()); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid); + loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName()); + loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath()); + loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages()); + List shareholderList = dto.getShareholderList(); + List loanPreloanCreditPeoDtos = new ArrayList<>(); + for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) { + LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto(); + loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey()); + loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue()); + loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName()); + loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages()); + loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto); + } + loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos); + loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages()); + loanPreloanCreditApplyFeign.submitSave(loanPreloanCreditApplyDto); + return rb.success(); } public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl index f597a5367f..9bcea29f9d 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl +++ b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl @@ -90,14 +90,17 @@ + + + + + - - - - - - - + + + + + @@ -125,7 +128,7 @@ - + @@ -203,8 +206,7 @@ - - + @@ -244,7 +246,8 @@ - + @@ -258,8 +261,8 @@ - - + + @@ -299,7 +302,7 @@ - @@ -314,7 +317,61 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 申请部门： + + + + + + @@ -325,6 +382,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${applyDept!} + + + + + + + + + + + + + + + @@ -363,13 +475,124 @@ + 申请人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${applyPeo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： - + @@ -410,7 +633,7 @@ - @@ -447,6 +670,7 @@ + @@ -495,7 +719,7 @@ - + @@ -641,7 +865,7 @@ - + @@ -760,6 +984,7 @@ + @@ -805,7 +1030,7 @@ - + @@ -927,7 +1152,7 @@ - + @@ -1020,6 +1245,8 @@ + + @@ -1084,14 +1311,14 @@ xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"> 1 - 46 - 130 + 57 + 164 0 0 - 1 + 2 false false - 132 + 164 WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA 0 @@ -1107,7 +1334,7 @@ 2014-10-29T12:08:00Z God 文档存本地丢失不负责 - 2023-07-26T02:06:08Z + 2023-07-27T03:16:23Z @@ -1120,7 +1347,7 @@ 2052-11.1.0.14309 - 4492228D1E0D435FAB03EB9C741608A2_13 + 2D380203F5044904B1BE9AE51DA87754_13 @@ -1196,14 +1423,6 @@ - - - - - - - @@ -1318,26 +1537,7 @@ - 申请 - - - - - - - - - - - - - - - - - - 人： + 申请人： @@ -1678,7 +1878,6 @@ - @@ -1691,7 +1890,6 @@ - @@ -1707,7 +1905,6 @@ - @@ -1723,7 +1920,6 @@ - @@ -1731,6 +1927,7 @@ + @@ -1743,19 +1940,13 @@ - - - - - - @@ -1765,13 +1956,18 @@ + + + + + @@ -1787,7 +1983,6 @@ - @@ -1825,28 +2020,27 @@ - - - + + + - diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl index d613ec936d..4482443354 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl +++ b/工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl @@ -87,13 +87,17 @@ - - - - - - - + + + + + + + + + + + @@ -120,7 +124,7 @@ - + @@ -198,8 +202,7 @@ - - + @@ -239,7 +242,8 @@ - + @@ -253,7 +257,7 @@ - + @@ -294,7 +298,7 @@ - @@ -309,7 +313,7 @@ - + @@ -358,13 +362,123 @@ - 单据编号： + 申请部门： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${applyDept!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 申请人： - + @@ -405,7 +519,117 @@ - + + + + + + + + ${applyPeo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -442,6 +666,7 @@ + @@ -539,6 +764,7 @@ + @@ -587,6 +813,7 @@ + @@ -754,6 +981,7 @@ + @@ -840,6 +1068,7 @@ + @@ -880,6 +1109,7 @@ + @@ -1044,14 +1274,14 @@ xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"> 1 - 46 - 130 + 57 + 164 0 0 1 false false - 130 + 164 WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA 0 @@ -1067,7 +1297,7 @@ 2014-10-29T12:08:00Z God 文档存本地丢失不负责 - 2023-07-26T02:10:32Z + 2023-07-27T03:17:59Z @@ -1080,7 +1310,7 @@ 2052-11.1.0.14309 - 9E93676032D7485AB417A9E0980BAF53_13 + 21863D8A3CFD4FDB924FD0A9161B1128_13 @@ -1465,7 +1695,6 @@ - @@ -1477,7 +1706,6 @@ - @@ -1498,7 +1726,7 @@ - + @@ -1517,13 +1745,13 @@ + - @@ -1543,6 +1771,7 @@ + @@ -1565,10 +1794,11 @@ + + - @@ -1583,7 +1813,6 @@ - @@ -1633,7 +1862,7 @@ - + @@ -1649,7 +1878,6 @@ - diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc b/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc index 673324e3f980295f2a0efa191b99c6fb67489de1..fcf004648dd8479e0b9744545c9fb57e76129374 100644 GIT binary patch delta 2156 zcmai#du$X{6vpqJnSHh0vVASEeeCSEz_NXa^g#te5o#%=G!&~4Kq#a(n?S_GLJIV; z5Di!ogB-v&K_mf9#kND#Kr97~p+G=MZJ?>tm`!NVH2$L`2(I60T^wVgv-!=r=iYN4 zbMANVhEK_Gm+W#WGC)bnV(F%56tA2?+Z1owbRona(P)&JiE@zr?%GxIptdFPmlF4> z(!N_#MP=A-?9|$&oJIF7ja09sCS{@43v}QE=(bDt*fXRxeCNu^(muoQcumSZMt9to zGMpYsUQqzmy@$Ow37`H6Aej>ZRq0t(H4ZAyTQht?fAqlUVNcYCNq32j;zj(nh#i>nd6b%vq*h@Q9Cx&i z)2uyjv}~-*$9f8Ap+1?u_jsvOUkY1d!cXs|Z_cU1XRQWnz$VZDLZBH$u5=x4*;p|# z&_#c20P|q6vbR9kxl0RZ1N%S+I0}w~k3c7g^q;2Y=jLQkm46Z4&UnkTp4i&FdBV=2 zXTYbR7xaNk;4-)YZuP#|x@x`~`K2yj4FxkN)A@`&f3dkh*f?ka41*s)1dM{a;5Tp| zM0!8ix3zAbPChLac`7kF^_6mbtdVSA9!ER?!XbnPQh^(IKo-aYk^Zj3J2zD1BGW-0 z0a*@FeP#(b$`(oCumUg}lz<9Q397*gupa#1FonX-VfCN^gur&N6SROZ*atem_)ss1 zC9|=lLM^bk%0;KDIU2C2Xebl?Zig4JLRh+O~h(2jHPx?*dSfH6kLFe+z8+`Ej)bf$z%&;0m^sp#9h+AGv;yDp91+Zp# zOL!kR;hayNG!#cQ#aW4y5vkzPAAgFB?Zs22c75oxy#|$3E7N3HiZ9T_@FVeym1DNs z(4N>UwVQD>%Z&YV>!hoQKMen0{KB7Zl=W;(ntxYXxkcJ3TC2+<(pPSfMMijKlRRFn z$SjgIr8Kf&ZOR#8KNP*74mie~o80p~HM%2*YIEJRwJcyF)h3S|ih2h1*K2h(eZpi+ zm`pals_!(3925^)gjDl2SgEKfR#-(MrHY0^Q|NUM>p-LVz@_ZAsctEQrLYku7SAT2o`%N+?~R zBG!hq$f1f_iLo(h>m!tDs?nrcZA^oP4^@dM+Qy(CYQ*?KO-NJxpXqK~L!z_!?VWq~ z?3p`r@0tEd)qh$|dNftYUTu@g;d``PRmA(XT-UAT<>j?RB<-zpEgfpqyvKcg_}4R! zd^D#__+f)p?=kl&733w$E`8A2t6m7_PuYCRN^f-|N)IF+Q)*B@Xa7_=Qt^jUFTRM_ z>ni84C5bPF3zB6b97+>SO-F?XNor@@$TP%46zu~MFzsy^SHltmW zK-Bb4I1Qjb#RINQmSS8+<4cL9+1Knu`G|SiM%1MdtwSsS-GkT^MATdUSVa_&e_7YM ziDncA>r&D@w=cCDZ4ttcqkV;y_n_r2oTcj(NqNd@au9u^>6ccID*c1i-I^Xrea6Hi zo+ehA1=jN~M;_W%j%<~@A&|zavT}JOvyXT9ZCsugjP|SfwXDZ;n=z?YXom+O3|+AB z`Q(YcZ9(Ly<|%&@_xcZmSJawqE!Ownk7G_ez zA^%J?Q%#T(Bw_@{U>r`u1e}F;VG`ypo;td>y?zZ+BpWF_c{Lm^=zvER{TGc}Q}9 zKDKPhD&uY4%DrHpJjG0J9NHxfeT8-G~ z*T(ox$f%HpssKN^E}+rd+)*{igRLIN17sdszG;6r^$S0@l&7-m?mPQDc$xj{$eLX- ze*zYqKIVRnJ<;Wa@IDHJMG1I>;oml}eNwS+z1frREpqm8FU8>`I(hv8y)QT^hZR z(G;U((-PzHdam n>Wv+m^0R8K)pxcnD!jUXQ0#5aRBkS7?oe)hxOtz#Ms)rSs63p- diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc b/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc index ce3a5cab8ce3edd4f8d2c2fee3ca643e5241cf32..fddc088490c0443d2972cd39b3e2673b84cc5a95 100644 GIT binary patch delta 1881 zcma)-X>3$g6vyv<%gme3LN`h~-DaSLaoSD^lqtc2jm1({i(p!TLQ&KvG}0KBGw_<&0wBI)=)(++83OnfiDoV%QR z=HCA~@6N7Hx$83-PE=$zB`Ir-EFr{bG#aI?7M~nFx$+g+p*6a~okNki{WqkF+46L1 z(RRoI`b*nR)$=uK)YY*uC(SVm79?QwGH`&KzzIfx3;YQtfyW>bXjqjD>wryx zZI{$#ygsLV)%V50=VduYM0@AoO@Ca9wRa64dvZi95Pa0YxZNu#VC$gw?IqN23oCnt z`DVfj+2Pn~p9+s&{!tt+$yrRdwPfmdlvw!pcWU&=(W3Kg7M+~5lrA`HX-#n-Kb^DCDfrdk|Tnki8)L7G%l8 z+&hL44T=!6VR=m>d?!;VagV+MQBB^2o{Uu=ndeeYNQ-KRP^uY9?2zV}lxF3**>62O zIMP0H)E%`V-gdE3G~sO&+Ys$lw6+SbXcJb!erHzv+p8L0Tg-yA1CnHVzU9=h){Rv~ z*kORmbEeQQ>ABRCvluowfvNOy#^$`$*l{gb16~H3Km%w7k)iO>){T{8fzEs40VW2E zw{ru+;3chK2iOk|fG+SU=mtF?aq@g|iRW1wc7HfwKk>cg77Bx1PlK;PALs`I zU=UmdH~Ko;YRb}}G=+0lkUw(@edpdi&gOuyvePwi6Wj(7FamxB55OZ3={vE1%j%~+ zl;D3Z+w|cM%G=R533up!Jf_)$s=8dY^*v&jD%kx9uWt5zM zZ+s{0(glu#&p|in1Lwg27zB|^UmV%CNz|Zpcav+zeT1o3gmKE}P;6WwTpc^e>G!*8 zpv;q}h>Cp~eYn3Wm02W$o-?YJD;9;Dvb^nrTzzQ={da8 zqh?-@nXECB&Bjaji?m8Z%(<=$sUFf`rJ~-lz$&WR!hKa!f9JlYtCP8}ThtmWti`Hc zRbj1$+J$QgI(}R5_FnqM)EW-8iL zfthr`spU+>)n*M@xIr83tH_~hMN3flD(2^o*;|nzQ?LB=&3oMCJAUkj$94Ym!g9rX y7JY^vi8tPk+di{w(JHC7d+(SZRGpQHcg9>}cRBv+qPV_2=Jq9frFl8!wEPF2xX`Qs delta 1524 zcmai!e@t6d6vyvbb5ynO2{(clxiiJ~O)@ z^I#OkG^i%z1-h*sllk`0jda^`%;JI1XegiKJGy}}yI%*gyr(Bt-DLq5WH(RXT~vIL_>yjj$Qco@Ae zKilVKyoBc&O4=SWe1Jt1x?~EKeQ(aDzRxH`uOdVUJjv97CRp%fK9NN43 zrJ^aR-N7_#o}P53rT%%*fTAagMU;>;1li*`;7EFVMi&L-n z?Rvlm30FqK>5tOBKrfhtTzgm;+3h^|415W`0$0H`a0C1VcsqknJrcrxf_KSG(z+aE z*zITV8(0B<17Q+E1%RmaG6ZP`~x)yEo8s{ z_maGB?11aaHI3&EA@_ASPHpt$=BU)Et3E}kSe2zmsN-wW@LA{35;PYa(EJ|$fLG}-EccDg&d0qo)o zqB~7jHb)t=Aq`JHCDk0b-dR5_J^aX(=W285xLln3O}eMy7irprVJ7vuDf*|Z1 zIkTMAqkywI00u!OyX0xuNNES#WZTcBLP;s%_3-f=E=j)=oZm?*52n-#w0xXtRf+C0*A;@YPN`7wLX@dXx_ ndf?F(#s4 Date: Thu, 27 Jul 2023 11:49:42 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busmaindeposit/BusMainDepositService.java | 1 + ...inUncollectedReceivablesDetailedMapper.xml | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 56f0a55ae5..a7dc9d447c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1882,6 +1882,7 @@ public class BusMainDepositService extends MybatisBaseService 0, ',') FROM fin_selected_receivables_detailed From ab9d18ded1492cbf27b5b132d62e4fd64e223ef1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 27 Jul 2023 13:39:19 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busmaindeposit/BusMainDepositMapper.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index 79c88b5ed3..312f5a5081 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -383,6 +383,27 @@ \ No newline at end of file From 407ea17421e07b0722431610e229af6be05b1a03 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Jul 2023 15:20:54 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanPreloanCreditApplyService.java | 23 +- .../CreditReviewDetailsOffVo.java | 38 +++ .../risk/creditreview/CreditReviewFeign.java | 30 +- .../CreditReviewFeignFallback.java | 18 +- .../risk/creditreview/CreditReviewOffDto.java | 2 +- .../risk/creditreview/CreditReviewRest.java | 26 +- .../creditreview/CreditReviewService.java | 286 +++++++++++++++--- 7 files changed, 351 insertions(+), 72 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index d12bef5713..14cc2a901e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -217,7 +217,15 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; @@ -380,6 +400,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService idCardImages1 = loanPreloanCreditPeo.getIdCardImages(); for (String s : idCardImages1) { CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java new file mode 100644 index 0000000000..0bd47e2a23 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.terminal.api.risk.creditreview; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class CreditReviewDetailsOffVo extends CreditReviewDetailsVo{ + + @ApiModelProperty("查询结果截图（公司）") + private List searchResultImages; + @ApiModelProperty("审核结果key（公司）") + private String examineResultKey; + @ApiModelProperty("审核结果（公司）") + private String examineResult; + @ApiModelProperty("审核日期（公司）") + private String examineDate; + @ApiModelProperty("审核备注（公司）") + private String examineRemarks; + @ApiModelProperty("资方剩余额度") + private String manageLeave; + @ApiModelProperty("查询结果截图（资方）") + private List searchResultImages2; + @ApiModelProperty("审核结果key（资方）") + private String examineResultKey2; + @ApiModelProperty("审核结果key（资方）") + private String examineResult2; + @ApiModelProperty("审核日期（资方）") + private String examineDate2; + @ApiModelProperty("审核备注（资方）") + private String examineRemarks2; + @ApiModelProperty("公司风控结果") + private List companyResultDict = new ArrayList<>(); + @ApiModelProperty("资方风控结果") + private List managementResultDict = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java index 3f052da630..a4f8a93c2a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java @@ -29,16 +29,21 @@ import java.util.List; fallback = CreditReviewFeignFallback.class) public interface CreditReviewFeign { - @ApiOperation("获取贷前信用审核列表") - @PostMapping("/getCreditReviewList") - @ResponseBody - public ResultBean> getCreditReviewList(@RequestBody PagerQuery pagerQuery); - - @ApiOperation("获取贷前信用审核 个人/企业") + @ApiOperation("初始化贷前信用审核") @GetMapping("/initCreditReviewInfo") @ResponseBody public ResultBean initCreditReviewInfo(@SpringQueryMap CreditReviewDetailsQuery query); + @ApiOperation("初始化金融内勤审核") + @GetMapping("/initCreditReviewInfo2") + @ResponseBody + public ResultBean initCreditReviewInfo2(@SpringQueryMap CreditReviewDetailsQuery query); + + @ApiOperation("详情") + @GetMapping("/getCreditReviewInfo") + @ResponseBody + public ResultBean getCreditReviewInfo(@RequestParam("sid") String sid); + @ApiOperation("查询车型信息") @GetMapping("/selModelByUseOrgSid") @ResponseBody @@ -49,7 +54,7 @@ public interface CreditReviewFeign { @ResponseBody public ResultBean> getTRCList(@SpringQueryMap CreditReviewDetailsQuery query); - @ApiOperation("保存贷前信用审核申请") + @ApiOperation("保存贷前信用审核") @PostMapping("/saveCreditReviewInfo") @ResponseBody public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto); @@ -59,8 +64,13 @@ public interface CreditReviewFeign { @ResponseBody public ResultBean submitCreditReviewInfo(@RequestBody CreditReviewDto dto); - @ApiOperation("保存贷前信用审核申请1") - @PostMapping("/saveCreditReviewInfo1") + @ApiOperation("保存金融内勤审核") + @PostMapping("/saveCreditReviewInfo2") + @ResponseBody + public ResultBean saveCreditReviewInfo2(@RequestBody CreditReviewOffDto dto); + + @ApiOperation("提交金融内勤审核") + @PostMapping("/submitCreditReviewInfo2") @ResponseBody - public ResultBean saveCreditReviewInfo1(@RequestBody CreditReviewOffDto dto); + public ResultBean submitCreditReviewInfo2(@RequestBody CreditReviewOffDto dto); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java index 242d9782b6..db8b741c32 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java @@ -19,14 +19,18 @@ import java.util.List; @Component public class CreditReviewFeignFallback implements CreditReviewFeign { + @Override + public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { + return null; + } @Override - public ResultBean> getCreditReviewList(PagerQuery pagerQuery) { + public ResultBean initCreditReviewInfo2(CreditReviewDetailsQuery query) { return null; } @Override - public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { + public ResultBean getCreditReviewInfo(String sid) { return null; } @@ -46,12 +50,18 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { } @Override - public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) { return null; } @Override - public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { + public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) { return null; } + + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return null; + } + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java index 2ea4c4fff6..aec286395a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java @@ -25,7 +25,7 @@ public class CreditReviewOffDto extends CreditReviewDto{ @ApiModelProperty("查询结果截图（资方）") private List searchResultImages2 = new ArrayList<>(); @ApiModelProperty("审核结果key（资方）") - private String examineResult2Key; + private String examineResultKey2; @ApiModelProperty("审核结果（资方）") private String examineResult2; @ApiModelProperty("审核日期（资方）") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java index 058d272210..80ced5e45b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java @@ -30,13 +30,18 @@ public class CreditReviewRest implements CreditReviewFeign { private CreditReviewService creditReviewService; @Override - public ResultBean> getCreditReviewList(PagerQuery pagerQuery) { - return creditReviewService.getCreditReviewList(pagerQuery); + public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { + return creditReviewService.initCreditReviewInfo(query); } @Override - public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { - return creditReviewService.initCreditReviewInfo(query); + public ResultBean initCreditReviewInfo2(CreditReviewDetailsQuery query) { + return creditReviewService.initCreditReviewInfo2(query); + } + + @Override + public ResultBean getCreditReviewInfo(String sid) { + return creditReviewService.getCreditReviewInfo(sid); } @Override @@ -55,12 +60,17 @@ public class CreditReviewRest implements CreditReviewFeign { } @Override - public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { - return creditReviewService.submitCreditReviewInfo(dto); + public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) { + return creditReviewService.saveCreditReviewInfo2(dto); } @Override - public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { - return null; + public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) { + return creditReviewService.submitCreditReviewInfo2(dto); + } + + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return creditReviewService.submitCreditReviewInfo(dto); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index 3c1f56c646..b02715612f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -63,47 +63,11 @@ public class CreditReviewService { @Autowired private LoanFinBankFeign loanFinBankFeign; - public ResultBean> getCreditReviewList(PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = new PagerQuery<>(); - CreditReviewQuery params = pagerQuery.getParams(); - LoanPreloanCreditApplyQuery loanParams = new LoanPreloanCreditApplyQuery(); - loanParams.setOrgSidPath(params.getOrgPath()); - loanParams.setUserSid(params.getUserSid()); - loanParams.setType(params.getType()); - loanParams.setMenuSid(params.getMenuSid()); - loanParams.setName(params.getNames()); - pq.setParams(loanParams); - PagerVo loanPreloanCreditApplyVoPagerVo = loanPreloanCreditApplyFeign.listPage(pq).getData(); - PagerVo v = new PagerVo<>(); - List creditReviewVos = new ArrayList<>(); - for (LoanPreloanCreditApplyVo record : loanPreloanCreditApplyVoPagerVo.getRecords()) { - CreditReviewVo creditReviewVo = new CreditReviewVo(); - creditReviewVo.setSid(record.getSid()); - creditReviewVo.setCreateDate(DateUtil.formatDate(record.getCreateTime())); - creditReviewVo.setName(record.getKhqyName()); - creditReviewVo.setMobile(record.getPhone()); - creditReviewVo.setModel(record.getModelName()); - creditReviewVo.setManagement(record.getCapitalName()); - creditReviewVo.setExamineDate(record.getGsshDate()); - creditReviewVo.setCompanyResults(record.getGsfkjg()); - creditReviewVo.setManagementResults(record.getZffkjg()); - creditReviewVo.setShowDeleteBtn(record.getIsDelete()); - creditReviewVo.setShowUpdateBtn(record.getIsEdit()); - creditReviewVo.setShowHandleBtn(record.getIsHandle()); - creditReviewVo.setCustomerKey(record.getCustTypeKey()); - creditReviewVo.setAppealResults(record.getSsjg()); - creditReviewVos.add(creditReviewVo); - } - v.setRecords(creditReviewVos); - return rb.success().setData(v); - } - public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); CreditReviewDetailsVo creditReviewDetailsVo = new CreditReviewDetailsVo(); - if (StringUtils.isBlank(query.getSid())){//新增初始化 - if (query.getCreateSource() == 0){ + if (StringUtils.isBlank(query.getSid())) {//新增初始化 + if (query.getCreateSource() == 0) { SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); creditReviewDetailsVo.setUserSid(query.getUserSid()); @@ -112,12 +76,12 @@ public class CreditReviewService { creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date())); creditReviewDetailsVo.setCustomerTypeKey(query.getCustomerTypeKey()); creditReviewDetailsVo.setCustomerType(query.getCustomerTypeValue()); - }else if (query.getCreateSource() == 1){//意向车型发起 + } else if (query.getCreateSource() == 1) {//意向车型发起 - }else if (query.getCreateSource() == 2){//销售订单发起 + } else if (query.getCreateSource() == 2) {//销售订单发起 } - }else {//修改回显 + } else {//修改回显 LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); creditReviewDetailsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); creditReviewDetailsVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); @@ -159,13 +123,13 @@ public class CreditReviewService { } //构建人员类型下拉选数据 List identityDetailsVos = new ArrayList<>(); - if ("1".equals(query.getCustomerTypeKey())){ + if ("1".equals(query.getCustomerTypeKey())) { IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo(); identityDetailsVo.setSid("003"); identityDetailsVo.setDictKey("003"); identityDetailsVo.setDictValue("担保人"); identityDetailsVos.add(identityDetailsVo); - }else { + } else { IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo(); identityDetailsVo.setSid("001"); identityDetailsVo.setDictKey("001"); @@ -186,6 +150,102 @@ public class CreditReviewService { return rb.success().setData(creditReviewDetailsVo); } + public ResultBean initCreditReviewInfo2(CreditReviewDetailsQuery query) { + ResultBean rb = ResultBean.fireFail(); + CreditReviewDetailsOffVo creditReviewDetailsoffVo = new CreditReviewDetailsOffVo(); + if (StringUtils.isBlank(query.getSid())) {//新增初始化 + if (query.getCreateSource() == 0) { + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); + creditReviewDetailsoffVo.setUserSid(query.getUserSid()); + creditReviewDetailsoffVo.setOrgPath(query.getOrgPath()); + creditReviewDetailsoffVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName()); + creditReviewDetailsoffVo.setCreateTime(DateUtil.formatDate(new Date())); + creditReviewDetailsoffVo.setCustomerTypeKey(query.getCustomerTypeKey()); + creditReviewDetailsoffVo.setCustomerType(query.getCustomerTypeValue()); + } else if (query.getCreateSource() == 1) {//意向车型发起 + + } else if (query.getCreateSource() == 2) {//销售订单发起 + + } + } else {//修改回显 + LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); + creditReviewDetailsoffVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); + creditReviewDetailsoffVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); + creditReviewDetailsoffVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime())); + creditReviewDetailsoffVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + creditReviewDetailsoffVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue()); + creditReviewDetailsoffVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName()); + creditReviewDetailsoffVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid()); + creditReviewDetailsoffVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName()); + creditReviewDetailsoffVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid()); + creditReviewDetailsoffVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone()); + creditReviewDetailsoffVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard()); + creditReviewDetailsoffVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages()); + creditReviewDetailsoffVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid()); + creditReviewDetailsoffVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsoffVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName()); + creditReviewDetailsoffVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid()); + creditReviewDetailsoffVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles()); + creditReviewDetailsoffVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid()); + creditReviewDetailsoffVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName()); + //creditReviewDetailsoffVo.setDownUrl(); + //参数优化 + query.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + //风控要求的其他人员 + List shareholderDetailsVos = new ArrayList<>(); + List loanPreloanCreditPeos = loanPreloanCreditApplyDetailsVo.getLoanPreloanCreditPeos(); + for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeo : loanPreloanCreditPeos) { + ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo(); + shareholderDetailsVo.setShareholderName(loanPreloanCreditPeo.getPeoName()); + shareholderDetailsVo.setShareholderMobile(loanPreloanCreditPeo.getPhone()); + shareholderDetailsVo.setShareholderIdNumber(loanPreloanCreditPeo.getIdCard()); + shareholderDetailsVo.setShareholderRemarks(loanPreloanCreditPeo.getRemarks()); + shareholderDetailsVo.setShareholderTypeKey(loanPreloanCreditPeo.getPeoTypeKey()); + shareholderDetailsVo.setShareholderTypeValue(loanPreloanCreditPeo.getPeoTypeValue()); + shareholderDetailsVo.setShareholderIdCardImages(loanPreloanCreditPeo.getIdCardImages()); + shareholderDetailsVos.add(shareholderDetailsVo); + } + creditReviewDetailsoffVo.setShareholderList(shareholderDetailsVos); + //公司风控 + creditReviewDetailsoffVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults()); + creditReviewDetailsoffVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey()); + creditReviewDetailsoffVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg()); + creditReviewDetailsoffVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate()); + creditReviewDetailsoffVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks()); + //资方风控 + creditReviewDetailsoffVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance()); + creditReviewDetailsoffVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults()); + creditReviewDetailsoffVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey()); + creditReviewDetailsoffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg()); + creditReviewDetailsoffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate()); + creditReviewDetailsoffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); + } + //构建人员类型下拉选数据 + List companyResultDict = new ArrayList<>(); + List managementResultDict = new ArrayList<>(); + IdentityDetailsVo identityDetailsVo1 = new IdentityDetailsVo(); + identityDetailsVo1.setSid("001"); + identityDetailsVo1.setDictKey("001"); + identityDetailsVo1.setDictValue("通过"); + companyResultDict.add(identityDetailsVo1); + managementResultDict.add(identityDetailsVo1); + IdentityDetailsVo identityDetailsVo2 = new IdentityDetailsVo(); + identityDetailsVo2.setSid("002"); + identityDetailsVo2.setDictKey("002"); + identityDetailsVo2.setDictValue("不通过"); + companyResultDict.add(identityDetailsVo2); + managementResultDict.add(identityDetailsVo2); + IdentityDetailsVo identityDetailsVo3 = new IdentityDetailsVo(); + identityDetailsVo3.setSid("003"); + identityDetailsVo3.setDictKey("003"); + identityDetailsVo3.setDictValue("暂无法判定"); + managementResultDict.add(identityDetailsVo3); + creditReviewDetailsoffVo.setCompanyResultDict(companyResultDict); + creditReviewDetailsoffVo.setManagementResultDict(managementResultDict); + return rb.success().setData(creditReviewDetailsoffVo); + } + public ResultBean> selModelByUseOrgSid(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); @@ -309,7 +369,7 @@ public class CreditReviewService { return rb.success(); } - public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { + public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) { ResultBean rb = ResultBean.fireFail(); LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto(); loanPreloanCreditApplyDto.setSid(dto.getSid()); @@ -336,18 +396,148 @@ public class CreditReviewService { loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid); loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName()); loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath()); - loanPreloanCreditApplyDto.setGsfkjgKey(""); + loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages()); + List shareholderList = dto.getShareholderList(); + List loanPreloanCreditPeoDtos = new ArrayList<>(); + for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) { + LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto(); + loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey()); + loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue()); + loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName()); + loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages()); + loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto); + } + loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos); + loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages()); + loanPreloanCreditApplyDto.setGsfkjgKey(dto.getExamineResultKey()); loanPreloanCreditApplyDto.setGsfkjg(dto.getExamineResult()); loanPreloanCreditApplyDto.setGsshDate(dto.getExamineDate()); loanPreloanCreditApplyDto.setGsshRemarks(dto.getExamineRemarks()); loanPreloanCreditApplyDto.setGsQueryResults(dto.getSearchResultImages()); - loanPreloanCreditApplyDto.setZffkjgKey(""); + loanPreloanCreditApplyDto.setCapitalBalance(dto.getManageLeave()); + loanPreloanCreditApplyDto.setZffkjgKey(dto.getExamineResultKey2()); loanPreloanCreditApplyDto.setZffkjg(dto.getExamineResult2()); + loanPreloanCreditApplyDto.setZfshDate(dto.getExamineDate2()); loanPreloanCreditApplyDto.setZfshRemarks(dto.getExamineRemarks2()); loanPreloanCreditApplyDto.setZfQueryResults(dto.getSearchResultImages2()); - //loanPreloanCreditApplyFeign.save() - return null; + loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto); + return rb.success(); + } + + + public ResultBean getCreditReviewInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(sid).getData(); + CreditReviewDetailsOffVo creditReviewDetailsOffVo = new CreditReviewDetailsOffVo(); + creditReviewDetailsOffVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); + creditReviewDetailsOffVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); + creditReviewDetailsOffVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime())); + creditReviewDetailsOffVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + creditReviewDetailsOffVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue()); + creditReviewDetailsOffVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName()); + creditReviewDetailsOffVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid()); + creditReviewDetailsOffVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName()); + creditReviewDetailsOffVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid()); + creditReviewDetailsOffVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone()); + creditReviewDetailsOffVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard()); + creditReviewDetailsOffVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages()); + creditReviewDetailsOffVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid()); + creditReviewDetailsOffVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsOffVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName()); + creditReviewDetailsOffVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid()); + creditReviewDetailsOffVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles()); + creditReviewDetailsOffVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid()); + creditReviewDetailsOffVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName()); + //风控要求的其他人员 + List shareholderDetailsVos = new ArrayList<>(); + List loanPreloanCreditPeos = loanPreloanCreditApplyDetailsVo.getLoanPreloanCreditPeos(); + for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeo : loanPreloanCreditPeos) { + ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo(); + shareholderDetailsVo.setShareholderName(loanPreloanCreditPeo.getPeoName()); + shareholderDetailsVo.setShareholderMobile(loanPreloanCreditPeo.getPhone()); + shareholderDetailsVo.setShareholderIdNumber(loanPreloanCreditPeo.getIdCard()); + shareholderDetailsVo.setShareholderRemarks(loanPreloanCreditPeo.getRemarks()); + shareholderDetailsVo.setShareholderTypeKey(loanPreloanCreditPeo.getPeoTypeKey()); + shareholderDetailsVo.setShareholderTypeValue(loanPreloanCreditPeo.getPeoTypeValue()); + shareholderDetailsVo.setShareholderIdCardImages(loanPreloanCreditPeo.getIdCardImages()); + shareholderDetailsVos.add(shareholderDetailsVo); + } + creditReviewDetailsOffVo.setShareholderList(shareholderDetailsVos); + //公司风控 + creditReviewDetailsOffVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults()); + creditReviewDetailsOffVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey()); + creditReviewDetailsOffVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg()); + creditReviewDetailsOffVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate()); + creditReviewDetailsOffVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks()); + //资方风控 + creditReviewDetailsOffVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance()); + creditReviewDetailsOffVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults()); + creditReviewDetailsOffVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey()); + creditReviewDetailsOffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg()); + creditReviewDetailsOffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate()); + creditReviewDetailsOffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); + return rb.success().setData(creditReviewDetailsOffVo); } + public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto(); + loanPreloanCreditApplyDto.setSid(dto.getSid()); + loanPreloanCreditApplyDto.setCreateBySid(dto.getUserSid()); + String[] publishInfos = dto.getPublishInfo().split("-"); + loanPreloanCreditApplyDto.setApplyDeptName(publishInfos[0]); + loanPreloanCreditApplyDto.setCreateByName(publishInfos[1]); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData(); + loanPreloanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid()); + loanPreloanCreditApplyDto.setModelSid(dto.getModelSid()); + loanPreloanCreditApplyDto.setModelName(dto.getModel()); + loanPreloanCreditApplyDto.setCustTypeKey(dto.getCustomerTypeKey()); + loanPreloanCreditApplyDto.setCustTypeValue(dto.getCustomerType()); + loanPreloanCreditApplyDto.setQySid(dto.getCompanySid()); + loanPreloanCreditApplyDto.setQyName(dto.getCompanyName()); + loanPreloanCreditApplyDto.setIdCard(dto.getLegalPersonIdNumber()); + loanPreloanCreditApplyDto.setCustSid(dto.getLegalPersonSid()); + loanPreloanCreditApplyDto.setCustName(dto.getLegalPersonName()); + loanPreloanCreditApplyDto.setPhone(dto.getLegalPersonMobile()); + loanPreloanCreditApplyDto.setCapitalSid(dto.getManagementSid()); + loanPreloanCreditApplyDto.setCapitalName(dto.getManagementName()); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid); + loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName()); + loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath()); + loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages()); + List shareholderList = dto.getShareholderList(); + List loanPreloanCreditPeoDtos = new ArrayList<>(); + for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) { + LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto(); + loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey()); + loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue()); + loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName()); + loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages()); + loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto); + } + loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos); + loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages()); + loanPreloanCreditApplyDto.setGsfkjgKey(dto.getExamineResultKey()); + loanPreloanCreditApplyDto.setGsfkjg(dto.getExamineResult()); + loanPreloanCreditApplyDto.setGsshDate(dto.getExamineDate()); + loanPreloanCreditApplyDto.setGsshRemarks(dto.getExamineRemarks()); + loanPreloanCreditApplyDto.setGsQueryResults(dto.getSearchResultImages()); + loanPreloanCreditApplyDto.setCapitalBalance(dto.getManageLeave()); + loanPreloanCreditApplyDto.setZffkjgKey(dto.getExamineResultKey2()); + loanPreloanCreditApplyDto.setZffkjg(dto.getExamineResult2()); + loanPreloanCreditApplyDto.setZfshDate(dto.getExamineDate2()); + loanPreloanCreditApplyDto.setZfshRemarks(dto.getExamineRemarks2()); + loanPreloanCreditApplyDto.setZfQueryResults(dto.getSearchResultImages2()); + loanPreloanCreditApplyFeign.finStaffConfirm(loanPreloanCreditApplyDto); + return rb.success(); + } }