From 21be2e3b00bf3b9ed28216b3945a9894d541ff28 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 4 Jun 2025 10:15:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index a0dcb94a81..8dc1c571d0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1629,9 +1629,8 @@ public class LoanSolutionsService extends MybatisBaseService Date: Wed, 4 Jun 2025 10:24:51 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 8dc1c571d0..abe5f57263 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -2581,6 +2581,7 @@ public class LoanSolutionsService extends MybatisBaseService Date: Wed, 4 Jun 2025 13:25:43 +0800 Subject: [PATCH 3/9] =?UTF-8?q?PC=E7=AB=AF=E9=83=A8=E5=88=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactoryDaliyReportFeign.java | 22 +- .../api/factoryDailyReport/PcBrandQuery.java | 16 + .../api/factoryDailyReport/PcBrandVo.java | 49 +++ .../api/factoryDailyReport/PcFgsQuery.java | 16 + .../api/factoryDailyReport/PcFgsVo.java | 55 +++ .../api/factoryDailyReport/PcSybQuery.java | 14 + .../api/factoryDailyReport/PcSybVo.java | 49 +++ .../FactoryDaliyReportMapper.java | 12 +- .../FactoryDaliyReportMapper.xml | 316 ++++++++++++++++++ .../FactoryDaliyReportRest.java | 21 ++ .../FactoryDaliyReportService.java | 114 +++++++ 11 files changed, 675 insertions(+), 9 deletions(-) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandQuery.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsQuery.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybQuery.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybVo.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 65a75e15a0..39948caf8f 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 @@ -2,6 +2,7 @@ package 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; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -18,10 +19,10 @@ import java.util.Map; path = "v1/factoryDailyReport", fallback = FactoryDaliyReportFeignFallback.class) public interface FactoryDaliyReportFeign { - /* @PostMapping("/pageList") - @ResponseBody - ResultBean pageList1(@RequestBody PagerQuery pagerQuery); -*/ + /* @PostMapping("/pageList") + @ResponseBody + ResultBean pageList1(@RequestBody PagerQuery pagerQuery); + */ @PostMapping("/pageList1") @ResponseBody ResultBean> pageList(@RequestBody PagerQuery pagerQuery); @@ -43,11 +44,20 @@ public interface FactoryDaliyReportFeign { ResultBean list4(@RequestParam("linkSid") String linkSid); - //--------------------------PC接口 - //集团跳转事业部 + //集团跳转事业部 + @PostMapping("/pcSybList") + @ResponseBody + ResultBean> pcSybList(@RequestBody PagerQuery pagerQuery); + //跳转到具体的事业部-事业部品牌 + @PostMapping("/pcBrandList") + @ResponseBody + ResultBean> pcBrandList(@RequestBody PagerQuery pagerQuery); + @PostMapping("/pcFgsList") + @ResponseBody + ResultBean> pcFgsList(@RequestBody PagerQuery pagerQuery); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandQuery.java new file mode 100644 index 0000000000..460c072e53 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/6/4 + **/ +@Data +public class PcBrandQuery implements Query { + private static final long serialVersionUID = -2009704878616982566L; + + private String sybSid; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandVo.java new file mode 100644 index 0000000000..0502c75288 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcBrandVo.java @@ -0,0 +1,49 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/6/4 + **/ +@Data +public class PcBrandVo { + + private String brandName; + + private String brandSid; + + @ApiModelProperty("年份") + private String year; + @ApiModelProperty("预提") + private String estimate; + @ApiModelProperty("上传金额") + private String upload; + @ApiModelProperty("调整") + private String adjust; + + @ApiModelProperty("未上传") + private UnUploadVo unUpload; + + @ApiModelProperty("合计") + @JsonIgnore + private String notUploadMoney; + @ApiModelProperty("返利") + @JsonIgnore + private String unuploaded_rebate; + @ApiModelProperty("费用合计") + @JsonIgnore + private String fee; + @ApiModelProperty("支出") + @JsonIgnore + private String expense_payment; + @ApiModelProperty("待支付") + @JsonIgnore + private String pending_payment; + @ApiModelProperty("抵顶") + @JsonIgnore + private String offset_payment; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsQuery.java new file mode 100644 index 0000000000..80f3b8768c --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/6/4 + **/ +@Data +public class PcFgsQuery implements Query { + private static final long serialVersionUID = -5192648136719147775L; + + private String sybSid; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsVo.java new file mode 100644 index 0000000000..5130a450f0 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcFgsVo.java @@ -0,0 +1,55 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/6/4 + **/ +@Data +public class PcFgsVo { + + private String fgsName; + + private String fgsSid; + + @ApiModelProperty("年份") + private String year; + @ApiModelProperty("预提") + private String estimate; + @ApiModelProperty("上传金额") + private String upload; + @ApiModelProperty("调整") + private String adjust; + @ApiModelProperty("未上传") + private UnUploadVo unUpload; + + @ApiModelProperty("合计") + @JsonIgnore + private String notUploadMoney; + @ApiModelProperty("返利") + @JsonIgnore + private String unuploaded_rebate; + @ApiModelProperty("费用合计") + @JsonIgnore + private String fee; + @ApiModelProperty("支出") + @JsonIgnore + private String expense_payment; + @ApiModelProperty("待支付") + @JsonIgnore + private String pending_payment; + @ApiModelProperty("抵顶") + @JsonIgnore + private String offset_payment; + + //仅分公司下返回 + @ApiModelProperty("分公司sid#年份") + private String linkSid; + + + +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybQuery.java new file mode 100644 index 0000000000..fd4f34f132 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybQuery.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/6/4 + **/ +@Data +public class PcSybQuery implements Query { + private static final long serialVersionUID = 8955789914036078450L; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybVo.java new file mode 100644 index 0000000000..9899fb558c --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/PcSybVo.java @@ -0,0 +1,49 @@ +package com.yxt.anrui.reportcenter.api.factoryDailyReport; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/6/4 + **/ +@Data +public class PcSybVo { + + private String sybName; + + private String sybSid; + + @ApiModelProperty("年份") + private String year; + @ApiModelProperty("预提") + private String estimate; + @ApiModelProperty("上传金额") + private String upload; + @ApiModelProperty("调整") + private String adjust; + + @ApiModelProperty("未上传") + private UnUploadVo unUpload; + + @ApiModelProperty("合计") + @JsonIgnore + private String notUploadMoney; + @ApiModelProperty("返利") + @JsonIgnore + private String unuploaded_rebate; + @ApiModelProperty("费用合计") + @JsonIgnore + private String fee; + @ApiModelProperty("支出") + @JsonIgnore + private String expense_payment; + @ApiModelProperty("待支付") + @JsonIgnore + private String pending_payment; + @ApiModelProperty("抵顶") + @JsonIgnore + private String offset_payment; +} 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 968e0729d8..6089dab743 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 @@ -1,10 +1,10 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; 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 com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; +import com.yxt.anrui.reportcenter.api.factoryDailyReport.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -41,4 +41,10 @@ public interface FactoryDaliyReportMapper { List getFsg2(@Param("fgsSid") String fgsSid, @Param("year") String year); List getBrandNameList2(@Param("fgsSid") String fgsSid, @Param("year") String year); + + IPage pcSybList(IPage page,@Param(Constants.WRAPPER)QueryWrapper qw); + + IPage pcBrandList(IPage page, @Param("sybSid") String sybSid); + + IPage pcFgsList(IPage page, @Param("sybSid")String sybSid); } 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 236b2da3b2..243cbe49ac 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 @@ -776,4 +776,320 @@ ORDER BY a.purchaseSystemSid desc, a.brandSid 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 b644ba3883..ee10330f5b 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 @@ -57,4 +57,25 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign { return factoryDaliyReportService.list4(linkSid); } + @Override + public ResultBean> pcSybList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = factoryDaliyReportService.pcSybList(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> pcBrandList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = factoryDaliyReportService.pcBrandList(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> pcFgsList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = factoryDaliyReportService.pcFgsList(pagerQuery); + return rb.success().setData(pv); + } + } 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 fd9d33060c..f40302fdee 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 @@ -1,14 +1,17 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport; import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportAppPagerQuery; import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo; +import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; import com.yxt.anrui.reportcenter.api.factoryDailyReport.*; import com.yxt.anrui.reportcenter.config.DecimalUtil; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -342,4 +345,115 @@ public class FactoryDaliyReportService { List factoryDaliyReportVoList = factoryDaliyReportMapper.getFsg2(fgsSid,year); return null; } + + public PagerVo pcSybList(PagerQuery pagerQuery) { + PcSybQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = factoryDaliyReportMapper.pcSybList(page, qw); + List recordList = pagging.getRecords(); + recordList.removeAll(Collections.singleton(null)); + if (!recordList.isEmpty()) { + for (int i = 0; i < recordList.size(); i++) { + PcSybVo pcSybVo = recordList.get(i); + pcSybVo.setEstimate(DecimalUtil.format(pcSybVo.getEstimate())); + pcSybVo.setUpload(DecimalUtil.format(pcSybVo.getUpload())); + pcSybVo.setAdjust(DecimalUtil.format(pcSybVo.getAdjust())); + pcSybVo.setNotUploadMoney(DecimalUtil.format(pcSybVo.getNotUploadMoney())); + pcSybVo.setUnuploaded_rebate(DecimalUtil.format(pcSybVo.getUnuploaded_rebate())); + pcSybVo.setFee(DecimalUtil.format(pcSybVo.getFee())); + pcSybVo.setExpense_payment(DecimalUtil.format(pcSybVo.getExpense_payment())); + pcSybVo.setPending_payment(DecimalUtil.format(pcSybVo.getPending_payment())); + pcSybVo.setOffset_payment(DecimalUtil.format(pcSybVo.getOffset_payment())); + UnUploadVo unUploadVo = new UnUploadVo(); + unUploadVo.setTotal(pcSybVo.getNotUploadMoney()); + unUploadVo.setFee(pcSybVo.getFee()); + unUploadVo.setFeeOutlay(pcSybVo.getExpense_payment()); + unUploadVo.setFeeTopping(pcSybVo.getOffset_payment()); + unUploadVo.setRebate(pcSybVo.getUnuploaded_rebate()); + unUploadVo.setFeeUnPaid(pcSybVo.getPending_payment()); + pcSybVo.setUnUpload(unUploadVo); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo pcBrandList(PagerQuery pagerQuery) { + PcBrandQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String sybSid = ""; + if (query != null) { + sybSid = query.getSybSid(); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = factoryDaliyReportMapper.pcBrandList(page, sybSid); + List recordList = pagging.getRecords(); + recordList.removeAll(Collections.singleton(null)); + if (!recordList.isEmpty()) { + for (int i = 0; i < recordList.size(); i++) { + PcBrandVo pcBrandVo = recordList.get(i); + pcBrandVo.setEstimate(DecimalUtil.format(pcBrandVo.getEstimate())); + pcBrandVo.setUpload(DecimalUtil.format(pcBrandVo.getUpload())); + pcBrandVo.setAdjust(DecimalUtil.format(pcBrandVo.getAdjust())); + pcBrandVo.setNotUploadMoney(DecimalUtil.format(pcBrandVo.getNotUploadMoney())); + pcBrandVo.setUnuploaded_rebate(DecimalUtil.format(pcBrandVo.getUnuploaded_rebate())); + pcBrandVo.setFee(DecimalUtil.format(pcBrandVo.getFee())); + pcBrandVo.setExpense_payment(DecimalUtil.format(pcBrandVo.getExpense_payment())); + pcBrandVo.setPending_payment(DecimalUtil.format(pcBrandVo.getPending_payment())); + pcBrandVo.setOffset_payment(DecimalUtil.format(pcBrandVo.getOffset_payment())); + UnUploadVo unUploadVo = new UnUploadVo(); + unUploadVo.setTotal(pcBrandVo.getNotUploadMoney()); + unUploadVo.setFee(pcBrandVo.getFee()); + unUploadVo.setFeeOutlay(pcBrandVo.getExpense_payment()); + unUploadVo.setFeeTopping(pcBrandVo.getOffset_payment()); + unUploadVo.setRebate(pcBrandVo.getUnuploaded_rebate()); + unUploadVo.setFeeUnPaid(pcBrandVo.getPending_payment()); + pcBrandVo.setUnUpload(unUploadVo); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo pcFgsList(PagerQuery pagerQuery) { + PcFgsQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String sybSid = ""; + if (query != null) { + sybSid = query.getSybSid(); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = factoryDaliyReportMapper.pcFgsList(page, sybSid); + List recordList = pagging.getRecords(); + recordList.removeAll(Collections.singleton(null)); + if (!recordList.isEmpty()) { + for (int i = 0; i < recordList.size(); i++) { + PcFgsVo pcFgsVo = recordList.get(i); + pcFgsVo.setEstimate(DecimalUtil.format(pcFgsVo.getEstimate())); + pcFgsVo.setUpload(DecimalUtil.format(pcFgsVo.getUpload())); + pcFgsVo.setAdjust(DecimalUtil.format(pcFgsVo.getAdjust())); + pcFgsVo.setNotUploadMoney(DecimalUtil.format(pcFgsVo.getNotUploadMoney())); + pcFgsVo.setUnuploaded_rebate(DecimalUtil.format(pcFgsVo.getUnuploaded_rebate())); + pcFgsVo.setFee(DecimalUtil.format(pcFgsVo.getFee())); + pcFgsVo.setExpense_payment(DecimalUtil.format(pcFgsVo.getExpense_payment())); + pcFgsVo.setPending_payment(DecimalUtil.format(pcFgsVo.getPending_payment())); + pcFgsVo.setOffset_payment(DecimalUtil.format(pcFgsVo.getOffset_payment())); + UnUploadVo unUploadVo = new UnUploadVo(); + unUploadVo.setTotal(pcFgsVo.getNotUploadMoney()); + unUploadVo.setFee(pcFgsVo.getFee()); + unUploadVo.setFeeOutlay(pcFgsVo.getExpense_payment()); + unUploadVo.setFeeTopping(pcFgsVo.getOffset_payment()); + unUploadVo.setRebate(pcFgsVo.getUnuploaded_rebate()); + unUploadVo.setFeeUnPaid(pcFgsVo.getPending_payment()); + pcFgsVo.setUnUpload(unUploadVo); + pcFgsVo.setLinkSid(pcFgsVo.getFgsSid()+"#"+pcFgsVo.getYear()); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } From a91be982edf1224d283107965e2d1006a783dea8 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 4 Jun 2025 13:40:01 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdelivered/BusDeliveredRest.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) 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 44a5a692e8..ad77d3eb20 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 @@ -33,27 +33,13 @@ 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.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-buscenter(业务管理)
- * File: BusDeliveredFeignFallback.java
- * Class: com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredRest
- * Description: 待出库车辆.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-04-24 10:21:44
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "待出库车辆") -@RestController("com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredRest") +@RestController @RequestMapping("v1/busdelivered") public class BusDeliveredRest implements BusDeliveredFeign { From 729f337c21c70daf0ac84b2fdfc4d81794391f5c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 4 Jun 2025 14:03:17 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=B4=AD?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=87=AD=E8=AF=81=E4=B8=AA=E8=B4=B7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=93=B6=E8=A1=8C=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanrepurchaseapply/LoanRepurchaseApplyService.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 6f1add3831..c4e8631ce3 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 @@ -47,6 +47,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto; @@ -61,6 +62,7 @@ import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo; import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; +import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loanrelievemortgage.LoanRelieveMortgageService; import com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost.LoanRepurchaseCompanyCostService; @@ -150,6 +152,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -937,6 +941,10 @@ public class LoanRepurchaseApplyService extends MybatisBaseService Date: Wed, 4 Jun 2025 14:11:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E8=AF=89=E8=AE=BC=E7=AE=A1=E7=90=86=E9=80=9A=E8=BF=87=E5=90=8E?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AEnull=E7=9A=84=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanlawsuitapply/LoanLawsuitApplyService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java index ce260605fc..011d82c1ba 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java @@ -718,8 +718,10 @@ public class LoanLawsuitApplyService extends MybatisBaseService Date: Wed, 4 Jun 2025 15:18:13 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= 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 c4e8631ce3..6bab3c5d8c 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 @@ -871,6 +871,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService Date: Wed, 4 Jun 2025 15:23:54 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java | 1 + .../anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java | 1 + .../api/loancaseprogressfees/LoanCaseProgressFees.java | 1 + .../api/loancaseprogresspreserve/LoanCaseProgressPreserve.java | 1 + 4 files changed, 4 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java index cc8dbdaf8c..58deb65acc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsFees.java @@ -17,6 +17,7 @@ import java.util.List; @Data public class DetailsFees { @ApiModelProperty("缴费项目") + private String paymentItemsKey; private String paymentItems; @ApiModelProperty("缴费时间") private String paymentTime; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java index 66f2fa25eb..ed8d6b26e2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/DetailsPreserve.java @@ -21,6 +21,7 @@ public class DetailsPreserve { @ApiModelProperty("保全类型") private String preserveType; @ApiModelProperty("保全项目") + private String preserveItemsKey; private String preserveItems; @ApiModelProperty("保全日期") private String preserveTime; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressfees/LoanCaseProgressFees.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressfees/LoanCaseProgressFees.java index afb1390473..19e3d81fb7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressfees/LoanCaseProgressFees.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogressfees/LoanCaseProgressFees.java @@ -21,6 +21,7 @@ public class LoanCaseProgressFees extends BaseEntity { @ApiModelProperty("主表sid") private String mainSid; @ApiModelProperty("缴费项目") + private String paymentItemsKey; private String paymentItems; @ApiModelProperty("缴费时间") private Date paymentTime; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresspreserve/LoanCaseProgressPreserve.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresspreserve/LoanCaseProgressPreserve.java index 24f1f4be84..ec5f8c80b9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresspreserve/LoanCaseProgressPreserve.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogresspreserve/LoanCaseProgressPreserve.java @@ -25,6 +25,7 @@ public class LoanCaseProgressPreserve extends BaseEntity { @ApiModelProperty("保全类型") private String preserveType; @ApiModelProperty("保全项目") + private String preserveItemsKey; private String preserveItems; @ApiModelProperty("保全日期") private Date preserveTime; From df511c4d96e42036d4889a46f52e31fd616cffb3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 4 Jun 2025 15:30:56 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesCustomerService.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerService.java index 3fc0bb724a..8a527d4d98 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerService.java @@ -24,6 +24,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.SalesVehVo; import com.yxt.anrui.riskcenter.biz.loanoutboundapply.LoanOutboundApplyService; import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService; import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService; +import com.yxt.anrui.riskcenter.biz.loansecondarysalesbidding.LoanSecondarySalesBiddingService; import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostMapper; import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService; import com.yxt.anrui.riskcenter.biz.loansecondarysalesveh.LoanSecondarySalesVehService; @@ -64,6 +65,8 @@ public class LoanSecondarySalesCustomerService extends MybatisBaseService