From 62b2cd46bd992b7e5554edcd87f9618c6088952b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 19 Jul 2023 17:17:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-devv.yml | 2 +- .../anrui/fin/api/kingdee/KingDeeBillId.java | 2 +- .../FinCollectionConfirmationMapper.xml | 10 +- .../FinCollectionConfirmationService.java | 9 +- .../FinFundsCarriedForwardApplyMapper.java | 3 + .../FinFundsCarriedForwardApplyService.java | 285 ++++++++++-------- .../FinFundsCarriedForwardVehMapper.java | 4 +- .../FinFundsCarriedForwardVehMapper.xml | 9 +- .../FinFundsCarriedForwardVehService.java | 6 +- .../FinSelectedReceivablesDetailedMapper.java | 2 +- .../FinSelectedReceivablesDetailedMapper.xml | 19 +- ...FinSelectedReceivablesDetailedService.java | 18 +- .../OtherReceivableBillService.java | 14 +- .../biz/kingdee/otherreceivablebill/data.json | 2 +- .../src/main/resources/application-devv.yml | 2 +- .../LoanPreloanCreditApplyFeign.java | 5 + .../LoanPreloanCreditApplyFeignFallback.java | 9 +- .../LoanPreloanCreditApplyMapper.java | 4 +- .../LoanPreloanCreditApplyRest.java | 6 + .../LoanPreloanCreditApplyService.java | 42 ++- .../src/main/resources/application-devv.yml | 2 +- .../{kqjz.ftl => kxjz.ftl} | 0 22 files changed, 291 insertions(+), 164 deletions(-) rename 工作内容需要的文档/单据模板/款项结转打印模板/{kqjz.ftl => kxjz.ftl} (100%) diff --git a/anrui-base/anrui-base-biz/src/main/resources/application-devv.yml b/anrui-base/anrui-base-biz/src/main/resources/application-devv.yml index 8e292998da..631bcdc0cb 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/application-devv.yml +++ b/anrui-base/anrui-base-biz/src/main/resources/application-devv.yml @@ -25,5 +25,5 @@ image: upload: path: D:\\anrui\\upload\\ url: - prefix: http://127.0.0.1:8111/upload/ + prefix: http://192.168.1.104:8111/upload/ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java index dc5e644857..ba4089a83b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java @@ -3,7 +3,7 @@ package com.yxt.anrui.fin.api.kingdee; public enum KingDeeBillId { AP_PAYABLE("AP_Payable", "应付单"), AR_RECEIVABLE("AR_receivable", "应收单"), - AR_OTHERRECEIVABLE("AR_OTHERRECEIVABLE", "其他应收单"), + AR_OTHERRECEIVABLE("AR_OtherRecAble", "其他应收单"), AP_PAYBILL("AP_PAYBILL", "付款单"), AR_RECEIVEBILL("AR_RECEIVEBILL", "收款单"), STK_INSTOCK("STK_InStock", "采购入库单"), 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 7a1bd16767..726a99f597 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 @@ -201,22 +201,22 @@ + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java index d3c5bec371..721e7dd228 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java @@ -166,7 +166,11 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService fetchJzMoneyByContractNoAndMainSid(String jzCustNo, String sid) { return baseMapper.fetchJzMoneyByContractNoAndMainSid(jzCustNo,sid); } + + public List fetchJzMoneyByCustSidAndMainSid(String custSid, String sid) { + return baseMapper.fetchJzMoneyByCustSidAndMainSid(custSid,sid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index 41fd10bffa..e23da0bbed 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -156,7 +156,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo,@Param("sid") String sid); String selectBalanceByReceivedSid(String receivablesSid); 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 16096279bd..d8c33850db 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 @@ -352,6 +352,7 @@ resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo"> SELECT ferd.sid, + fcc.createBySid AS createBySid, fcc.`useOrgSid`, fcc.`staffDeptName`, fcc.staffUserSid AS staffSid, @@ -377,9 +378,13 @@ AND fcc.`useOrgSid` = bv.`createOrgSid` LEFT JOIN `fin_funds_carried_forward_veh` ffc ON ffc.`busSid` = ferd.`sid` + + ${ew.SqlSegment} + UNION SELECT ferd.sid, + ffcfa.createBySid AS createBySid, ffcfa.useOrgSid, ffcfa.saleDeptName AS staffDeptName, ffcfa.staffSid, @@ -410,13 +415,6 @@ - - + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 38073324f8..dd497f100d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -525,6 +525,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService qw = new QueryWrapper<>(); //========================================数据授权开始 + String orgLevelKey = ""; if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) { //======================= PrivilegeQuery privilegeQuery = new PrivilegeQuery(); @@ -541,7 +542,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService p = new PagerVo<>(); return p; @@ -589,7 +590,16 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService wrapper.like("ferd.contractNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("ffcfa.saleDeptName",query.getName()).or().like("ffcfa.staffName",query.getName()).or().like("fcc.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName())); } qw.groupBy("ferd.sid"); - qw.having("reveivableMoney >=",query.getBalanceSmallMoney()).having("reveivableMoney <=",query.getBalanceBigMoney()); + if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && !"5".equals(orgLevelKey)){ + qw.having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney()); + }else if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){ + qw.having("createBySid = {0}",query.getUserSid()).having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney()); + }else if (StringUtils.isBlank(query.getBalanceSmallMoney()) && StringUtils.isBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){ + qw.having("createBySid = {0}",query.getUserSid()); + }else { + PagerVo p = new PagerVo<>(); + return p; + } IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.noOutVehRecPageList(page, qw); for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) { @@ -609,7 +619,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) { return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo,sid); } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java index 5c7599236d..e4b3f64dea 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/OtherReceivableBillService.java @@ -27,12 +27,22 @@ public class OtherReceivableBillService extends FinKingDeeService { //业务表的主表数据集合 Map map_fEntityModel_=new HashMap<>(); //物料的数组集合 + //业务日期 if(otherReceivable.getBussDate()==null){ return rb.setMsg("业务日期不能为空"); } - //业务日期 map_fEntityModel_.put("FDATE",otherReceivable.getBussDate()); - + //客户 + if(otherReceivable.getCommUnit()==null){ + return rb.setMsg("客户编码不能为空"); + } + map_fEntityModel_.put("FCONTACTUNIT",otherReceivable.getCommUnit()); + //收款组织 + if(otherReceivable.getCollectionOrg()==null){ + return rb.setMsg("收款组织不能为空"); + } + map_fEntityModel_.put("FPAYORGID",otherReceivable.getCollectionOrg()); + map_fEntityModel_.put("FSETTLEORGID",otherReceivable.getCollectionOrg()); List 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.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json index 08f7c432fe..dbd8ac9f92 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data.json @@ -1,4 +1,4 @@ { - "formId": "AR_OTHERRECEIVABLE", + "formId": "AR_OtherRecAble", "data": "@KD_data" } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml b/anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml index 73ba5452a7..70b6eb0e89 100644 --- a/anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml +++ b/anrui-portal/anrui-portal-biz/src/main/resources/application-devv.yml @@ -25,7 +25,7 @@ image: upload: path: D:\\anrui\\upload\\ url: - prefix: http://192.168.1.112:8111/upload/ + prefix: http://192.168.1.104:8111/upload/ login: path: D:\\images\\pic-click config: diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java index 728b1624e0..29b3d73f4a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java @@ -61,6 +61,11 @@ public interface LoanPreloanCreditApplyFeign { @ResponseBody public ResultBean submitSave(@RequestBody LoanPreloanCreditApplyDto dto); + @ApiOperation("金融内勤确认") + @PostMapping("/finStaffConfirm") + @ResponseBody + public ResultBean finStaffConfirm(@RequestBody LoanPreloanCreditApplyDto dto); + @ApiOperation("公司风控提交") @PostMapping("/submitCompanyRisk") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java index d78c530b14..eafff51a34 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java @@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.api.loanpreloancreditapply; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; import org.springframework.stereotype.Component; @Component @@ -49,11 +50,17 @@ public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApp return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanpreloancreditapply/save无法访问"); } - @Override + @ApiOperation("提交保存") + @Override public ResultBean submitSave(LoanPreloanCreditApplyDto dto) { return null; } + @Override + public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) { + return null; + } + @Override public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java index fe084784f2..4c3b942984 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java @@ -54,6 +54,6 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery1).getData(); - CommonAppendixSelectQuery commonAppendixSelectQuery2 = new CommonAppendixSelectQuery(); - commonAppendixSelectQuery2.setLinkSid(sid); - commonAppendixSelectQuery2.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode()); - List data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery2).getData(); + CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery(); + commonAppendixSelectQuery.setLinkSid(sid); + commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.ID_CARD.getCode()); + List data1 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData(); + commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_RISK.getCode()); + List data2 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData(); + commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode()); + List data4 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData(); + commonAppendixSelectQuery.setAttachType(LoanFileTypeEnum.FileTypeEnum.CAPITAL_QUERYRES.getCode()); + List data5 = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery).getData(); List idCardImages = new ArrayList<>(); List comFkFiles = new ArrayList<>(); + List gsQueryResults = new ArrayList<>(); + List zfQueryResults = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : data1) { idCardImages.add(commonAppendixVo.getFilePath()); } for (CommonAppendixVo commonAppendixVo : data2) { comFkFiles.add(commonAppendixVo.getFilePath()); } + for (CommonAppendixVo commonAppendixVo : data4) { + gsQueryResults.add(commonAppendixVo.getFilePath()); + } + for (CommonAppendixVo commonAppendixVo : data5) { + zfQueryResults.add(commonAppendixVo.getFilePath()); + } List loanPreloanCreditPeoDetailsVos = loanPreloanCreditPeoService.fetchByMainSid(sid); List idCardPeoImages = new ArrayList<>(); for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeoDetailsVo : loanPreloanCreditPeoDetailsVos) { @@ -419,6 +429,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService stringResultBean = saveOrUpdateDto(dto); + if (!stringResultBean.getSuccess()) { + return rb.setMsg("保存失败"); + } + String sid = stringResultBean.getData(); + baseMapper.updateStateBySid(sid,2); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml index a76b3dbbf6..0b51bde708 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-devv.yml @@ -24,4 +24,4 @@ image: upload: path: D:\\anrui\\upload\\ url: - prefix: http://192.168.1.112:8111/upload/ \ No newline at end of file + prefix: http://192.168.1.104:8111/upload/ \ No newline at end of file diff --git a/工作内容需要的文档/单据模板/款项结转打印模板/kqjz.ftl b/工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl similarity index 100% rename from 工作内容需要的文档/单据模板/款项结转打印模板/kqjz.ftl rename to 工作内容需要的文档/单据模板/款项结转打印模板/kxjz.ftl