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; + } }