From cba435b98102cc32e1b8b32c02d7c5dffe8e69e9 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 29 May 2025 15:52:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E8=B4=AD?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue | 3 ++- .../src/views/workFlow/huigouFlow/buybackEdit.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue index e1067d5e24..f25a1f68b6 100644 --- a/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue +++ b/anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue @@ -300,7 +300,8 @@ export default { // 公司结清费用模块--公司正常结清合计计算 calculateSettleAll() { let money = 0 - money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 + // 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金 + money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 return money }, // 结清利润计算 diff --git a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue index 4518fef971..b0adf32eb3 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue @@ -299,7 +299,8 @@ export default { // 公司结清费用模块--公司正常结清合计计算 calculateSettleAll() { let money = 0 - money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 + // 公司正常结清合计 = 公司逾期月还 + 资金占用费 + 资方逾期利息 + 公司当期未到期月还 + 公司未到期金额 + 贷款保证金扣罚金额 + 名义价 + 合同违约金 + 其它费用 - 贷款保证金 + money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 return money }, // 结清利润计算 From 3577f58c39913533039901ff72a706e0425f4145 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 29 May 2025 15:53:39 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=96=B9sid?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanrepurchaseapply/LoanRepurchaseApplyService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java index 1f1bd4e979..6f1add3831 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java @@ -1329,6 +1329,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService Date: Thu, 29 May 2025 16:07:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BA=8B=E4=B8=9A=E9=83=A8=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactoryDaliyReportFeign.java | 9 +- .../FactoryDaliyReportMapper.java | 4 + .../FactoryDaliyReportMapper.xml | 151 ++++++++++++++++++ .../FactoryDaliyReportRest.java | 5 + .../FactoryDaliyReportService.java | 59 +++++++ 5 files changed, 224 insertions(+), 4 deletions(-) diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java index 945c6cbb70..5ae1744350 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java @@ -3,10 +3,7 @@ package com.yxt.anrui.reportcenter.api.factoryDailyReport; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -33,6 +30,10 @@ public interface FactoryDaliyReportFeign { @ResponseBody ResultBean getSybList(); + @GetMapping("/sybBrands") + @ResponseBody + ResultBean sybBrands(@RequestParam("divisionSid") String divisionSid); + } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java index 1715371857..c82ec6bd4f 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java @@ -24,4 +24,8 @@ public interface FactoryDaliyReportMapper { List getSybNameList(); List getSybList(); + + List getBrandsNameList(String divisionSid); + + List getSybList2(String divisionSid); } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml index 4b1ae64782..b1cbc88295 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml @@ -279,4 +279,155 @@ ORDER BY a.division_name desc, a.year DESC; + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java index 95cd3f36aa..791df0e1f4 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java @@ -45,5 +45,10 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign { return factoryDaliyReportService.getSybList(); } + @Override + public ResultBean sybBrands(String divisionSid) { + return factoryDaliyReportService.getSybBrands(divisionSid); + } + } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java index 9c1e496ea3..99bd5e4faa 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java @@ -214,4 +214,63 @@ public class FactoryDaliyReportService { } return rb.success().setData(sysVo); } + + public ResultBean getSybBrands(String divisionSid) { + ResultBean rb = ResultBean.fireFail(); + SybVo sysVo = new SybVo(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(divisionSid).getData(); + if(sysOrganizationVo != null){ + sysVo.setTitle(sysOrganizationVo.getName()); + } + //先查询有哪些事业部以及事业部下的年份 + List brandNameList = factoryDaliyReportMapper.getBrandsNameList(divisionSid); + List factoryDaliyReportVoList = factoryDaliyReportMapper.getSybList2(divisionSid); + factoryDaliyReportVoList.removeAll(Collections.singleton(null)); + if(!factoryDaliyReportVoList.isEmpty()){ + for (int i = 0; i < factoryDaliyReportVoList.size(); i++) { + FactoryDaliyReportVo factoryDaliyReportVo = factoryDaliyReportVoList.get(i); + factoryDaliyReportVo.setEstimate(DecimalUtil.format(factoryDaliyReportVo.getEstimate())); + factoryDaliyReportVo.setUpload(DecimalUtil.format(factoryDaliyReportVo.getUpload())); + factoryDaliyReportVo.setAdjust(DecimalUtil.format(factoryDaliyReportVo.getAdjust())); + factoryDaliyReportVo.setNotUploadMoney(DecimalUtil.format(factoryDaliyReportVo.getNotUploadMoney())); + factoryDaliyReportVo.setUnuploaded_rebate(DecimalUtil.format(factoryDaliyReportVo.getUnuploaded_rebate())); + factoryDaliyReportVo.setFee(DecimalUtil.format(factoryDaliyReportVo.getFee())); + factoryDaliyReportVo.setExpense_payment(DecimalUtil.format(factoryDaliyReportVo.getExpense_payment())); + factoryDaliyReportVo.setPending_payment(DecimalUtil.format(factoryDaliyReportVo.getPending_payment())); + factoryDaliyReportVo.setOffset_payment(DecimalUtil.format(factoryDaliyReportVo.getOffset_payment())); + } + //年份 + List row2 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getYear).collect(Collectors.toList()); + //预提 + List row3 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getEstimate).collect(Collectors.toList()); + //上传 + List row4 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUpload).collect(Collectors.toList()); + //调整 + List row5 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getAdjust).collect(Collectors.toList()); + //未上传 + List row6 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getNotUploadMoney).collect(Collectors.toList()); + //其中返利 + List row7 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUnuploaded_rebate).collect(Collectors.toList()); + //其中费用 + List row8 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getFee).collect(Collectors.toList()); + //支出 + List row9 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getExpense_payment).collect(Collectors.toList()); + //待支付 + List row10 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getPending_payment).collect(Collectors.toList()); + //抵顶 + List row11 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getOffset_payment).collect(Collectors.toList()); + sysVo.setRow1(brandNameList); + sysVo.setRow2(row2); + sysVo.setRow3(row3); + sysVo.setRow4(row4); + sysVo.setRow5(row5); + sysVo.setRow6(row6); + sysVo.setRow7(row7); + sysVo.setRow8(row8); + sysVo.setRow9(row9); + sysVo.setRow10(row10); + sysVo.setRow11(row11); + } + return rb.success().setData(sysVo); + } } From fa43a6f1b5843865f1e6e63680571b3db476ce2a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 29 May 2025 16:08:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/settle/settleAdd.vue | 8 ++++++-- .../src/views/workFlow/jieqingFlow/settleEdit.vue | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue index 79a64f2742..724f144491 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue @@ -103,9 +103,13 @@
资方结清费用
-
贷款保证金:
+
贷款保证金: + {{ formobj.loanSettleBankCostVo.loanDeposit }} + +
是否抵顶: - + {{ formobj.loanSettleBankCostVo.topping ? '是' : '否' }} + 是 否 diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue index 4781df3e94..0d9dc7550e 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue @@ -102,9 +102,13 @@
资方结清费用
-
贷款保证金:
+
贷款保证金: + {{ formobj.loanSettleBankCostVo.loanDeposit }} + +
是否抵顶: - + {{ formobj.loanSettleBankCostVo.topping ? '是' : '否' }} + 是 否 From 01246c178e4ae7ca665d3b2d5394c8f756a8a836 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 29 May 2025 16:16:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/settle/settleAdd.vue | 2 +- .../src/views/workFlow/jieqingFlow/settleEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue index 724f144491..7ee174f8b8 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue @@ -104,7 +104,7 @@
资方结清费用
贷款保证金: - {{ formobj.loanSettleBankCostVo.loanDeposit }} + {{ formobj.loanSettleBankCostVo.loanDeposit }}
是否抵顶: diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue index 0d9dc7550e..838ee2a798 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue @@ -103,7 +103,7 @@
资方结清费用
贷款保证金: - {{ formobj.loanSettleBankCostVo.loanDeposit }} + {{ formobj.loanSettleBankCostVo.loanDeposit }}
是否抵顶: From db8a8a03df34cfd22f1be0f7514654e54a94fc0b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 29 May 2025 16:38:29 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=8D=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactoryDaliyReportFeign.java | 4 + .../api/factoryDailyReport/FgsVo.java | 30 +++ .../api/factoryDailyReport/FgsYearVo.java | 18 ++ .../FactoryDaliyReportMapper.java | 7 + .../FactoryDaliyReportMapper.xml | 181 ++++++++++++++++++ .../FactoryDaliyReportRest.java | 10 +- .../FactoryDaliyReportService.java | 55 ++++++ 7 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java index 5ae1744350..ddc99f5d81 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java @@ -34,6 +34,10 @@ public interface FactoryDaliyReportFeign { @ResponseBody ResultBean sybBrands(@RequestParam("divisionSid") String divisionSid); + @GetMapping("/list3") + @ResponseBody + ResultBean list3(@RequestParam("divisionSid") String divisionSid); + } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java new file mode 100644 index 0000000000..d2f9b2f439 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/5/29 + **/ +@Data +public class FgsVo { + + private String title; + + private List row1; + + private List row2; + + private List row3; + private List row4; + private List row5; + private List row6; + private List row7; + private List row8; + private List row9; + private List row10; + private List row11; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java new file mode 100644 index 0000000000..0a521a0f06 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/5/29 + **/ +@Data +public class FgsYearVo { + + private String name; + + private String title; + + private String linkSid; +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java index c82ec6bd4f..2821e4909c 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java @@ -3,6 +3,7 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo; +import com.yxt.anrui.reportcenter.api.factoryDailyReport.FgsYearVo; import com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -28,4 +29,10 @@ public interface FactoryDaliyReportMapper { List getBrandsNameList(String divisionSid); List getSybList2(String divisionSid); + + List getUseOrgNameList(String divisionSid); + + List getRow2(String divisionSid); + + List getFgsList(String divisionSid); } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml index b1cbc88295..29d74b3053 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml @@ -430,4 +430,185 @@ ORDER BY a.brandSid desc, a.year DESC; + + + + + + \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java index 791df0e1f4..303097d0a3 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportFeign; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo; -import com.yxt.anrui.reportcenter.api.factoryDailyReport.SybVo; +import com.yxt.anrui.reportcenter.api.factoryDailyReport.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -50,5 +47,10 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign { return factoryDaliyReportService.getSybBrands(divisionSid); } + @Override + public ResultBean list3(String divisionSid) { + return factoryDaliyReportService.list3(divisionSid); + } + } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java index 99bd5e4faa..7055e6db8e 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java @@ -273,4 +273,59 @@ public class FactoryDaliyReportService { } return rb.success().setData(sysVo); } + + public ResultBean list3(String divisionSid) { + ResultBean rb = ResultBean.fireFail(); + FgsVo fgsVo = new FgsVo(); + fgsVo.setTitle("分公司报表"); + //先查询有哪些分公司以及分公司下的年份 + List useOrgNameList = factoryDaliyReportMapper.getUseOrgNameList(divisionSid); + List row2 = factoryDaliyReportMapper.getRow2(divisionSid); + List factoryDaliyReportVoList = factoryDaliyReportMapper.getFgsList(divisionSid); + factoryDaliyReportVoList.removeAll(Collections.singleton(null)); + if(!factoryDaliyReportVoList.isEmpty()){ + for (int i = 0; i < factoryDaliyReportVoList.size(); i++) { + FactoryDaliyReportVo factoryDaliyReportVo = factoryDaliyReportVoList.get(i); + factoryDaliyReportVo.setEstimate(DecimalUtil.format(factoryDaliyReportVo.getEstimate())); + factoryDaliyReportVo.setUpload(DecimalUtil.format(factoryDaliyReportVo.getUpload())); + factoryDaliyReportVo.setAdjust(DecimalUtil.format(factoryDaliyReportVo.getAdjust())); + factoryDaliyReportVo.setNotUploadMoney(DecimalUtil.format(factoryDaliyReportVo.getNotUploadMoney())); + factoryDaliyReportVo.setUnuploaded_rebate(DecimalUtil.format(factoryDaliyReportVo.getUnuploaded_rebate())); + factoryDaliyReportVo.setFee(DecimalUtil.format(factoryDaliyReportVo.getFee())); + factoryDaliyReportVo.setExpense_payment(DecimalUtil.format(factoryDaliyReportVo.getExpense_payment())); + factoryDaliyReportVo.setPending_payment(DecimalUtil.format(factoryDaliyReportVo.getPending_payment())); + factoryDaliyReportVo.setOffset_payment(DecimalUtil.format(factoryDaliyReportVo.getOffset_payment())); + } + //预提 + List row3 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getEstimate).collect(Collectors.toList()); + //上传 + List row4 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUpload).collect(Collectors.toList()); + //调整 + List row5 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getAdjust).collect(Collectors.toList()); + //未上传 + List row6 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getNotUploadMoney).collect(Collectors.toList()); + //其中返利 + List row7 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUnuploaded_rebate).collect(Collectors.toList()); + //其中费用 + List row8 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getFee).collect(Collectors.toList()); + //支出 + List row9 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getExpense_payment).collect(Collectors.toList()); + //待支付 + List row10 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getPending_payment).collect(Collectors.toList()); + //抵顶 + List row11 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getOffset_payment).collect(Collectors.toList()); + fgsVo.setRow1(useOrgNameList); + fgsVo.setRow2(row2); + fgsVo.setRow3(row3); + fgsVo.setRow4(row4); + fgsVo.setRow5(row5); + fgsVo.setRow6(row6); + fgsVo.setRow7(row7); + fgsVo.setRow8(row8); + fgsVo.setRow9(row9); + fgsVo.setRow10(row10); + fgsVo.setRow11(row11); + } + return rb.success().setData(fgsVo); + } }