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 673324e3f9..fcf004648d 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc +++ b/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(激光打印机).doc @@ -1,7 +1,6 @@ |调账申请 | -|单据日期: |${saleDate!} |单据编号: |${billNo!} | -|调账类型 |合同编号 |客户名称 |物料编码 |调出金额 |调入金额 | +|单据日期: |${saleDate!} |申请部门: |${applyDept!} |申请人: |${applyPeo!} | |${tz.tzType!} |${tz.conNo!} |${tz.name!} |${tz.vinNo!} |${tz.dcje!} |${tz.drje!} | ----------------------- diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc b/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc index ce3a5cab8c..fddc088490 100644 --- a/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc +++ b/工作内容需要的文档/单据模板/款项结转打印模板/款项结转模板(针式打印机).doc @@ -1,6 +1,5 @@ |调账申请 | -|单据日期: |${saleDate!} |单据编号: |${billNo!} | -|调账类型 |合同编号 |客户名称 |物料编码 |调出金额 |调入金额 | +|单据日期: |${saleDate!} |申请部门: |${applyDept!} |申请人: |${applyPeo!} | |${tz.tzType!} |${tz.conNo!} |${tz.name!} |${tz.vinNo!} |${tz.dcje!} |${tz.drje!} |