PC端部分报表

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")
+    /* @PostMapping("/pageList")
-    @ResponseBody
+     @ResponseBody
-    ResultBean<FactoryDaliyReportVo> pageList1(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
+     ResultBean<FactoryDaliyReportVo> pageList1(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
-*/
+ */
     @PostMapping("/pageList1")
     @ResponseBody
     ResultBean<Map<String, Object>> pageList(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
@@ -43,11 +44,20 @@ public interface FactoryDaliyReportFeign {
     ResultBean<FgsDetailVo> list4(@RequestParam("linkSid") String linkSid);
 
 
-
     //--------------------------PC接口
-   //集团跳转事业部
+    //集团跳转事业部
+    @PostMapping("/pcSybList")
+    @ResponseBody
+    ResultBean<PagerVo<PcSybVo>> pcSybList(@RequestBody PagerQuery<PcSybQuery> pagerQuery);
 
+    //跳转到具体的事业部-事业部品牌
+    @PostMapping("/pcBrandList")
+    @ResponseBody
+    ResultBean<PagerVo<PcBrandVo>> pcBrandList(@RequestBody PagerQuery<PcBrandQuery> pagerQuery);
 
+    @PostMapping("/pcFgsList")
+    @ResponseBody
+    ResultBean<PagerVo<PcFgsVo>> pcFgsList(@RequestBody PagerQuery<PcFgsQuery> pagerQuery);
 
 
 }

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

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

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

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

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

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

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.dailyreport.DailyReport;
-import com.yxt.anrui.reportcenter.api.factoryDailyReport.FgsYearVo;
+import com.yxt.anrui.reportcenter.api.factoryDailyReport.*;
-import com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -41,4 +41,10 @@ public interface FactoryDaliyReportMapper {
     List<FactoryDaliyReportVo> getFsg2(@Param("fgsSid") String fgsSid, @Param("year") String year);
 
     List<String> getBrandNameList2(@Param("fgsSid") String fgsSid, @Param("year") String year);
+
+    IPage<PcSybVo> pcSybList(IPage<PcSybVo> page,@Param(Constants.WRAPPER)QueryWrapper<PcSybVo> qw);
+
+    IPage<PcBrandVo> pcBrandList(IPage<PcBrandVo> page, @Param("sybSid") String sybSid);
+
+    IPage<PcFgsVo> pcFgsList(IPage<PcFgsVo> page, @Param("sybSid")String sybSid);
 }

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;
 
     </select>
+
+    <select id="pcSybList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.PcSybVo">
+        SELECT
+            a.year,
+            so.name sybName,
+            so.sid sybSid,
+            ROUND(SUM(a.estimateRebate), 2) AS estimate,
+            ROUND(SUM(a.uploadMoney), 2) AS upload,
+            ROUND(SUM(a.adjustmentMoney), 2) AS adjust,
+            ROUND(SUM(a.notUploadMoney), 2) AS notUploadMoney,
+            ROUND(SUM(a.fee), 2) AS fee,
+            ROUND(SUM(a.expense_payment), 2) AS expense_payment,
+            ROUND(SUM(a.pending_payment), 2) AS pending_payment,
+            ROUND(SUM(a.offset_payment), 2) AS offset_payment,
+            ROUND(SUM(a.remaining_payment), 2) AS remaining_payment,
+            ROUND(SUM(a.unuploaded_rebate), 2) AS unuploaded_rebate
+        FROM (
+                 SELECT
+                     LEFT(palceGenDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_veh_rebate
+                 GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1)
+
+                 UNION ALL
+
+                 SELECT
+                     LEFT(palceGenDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_special_rebate
+                 GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1)
+
+                 UNION ALL
+
+                 SELECT
+                     LEFT(collectionDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - IFNULL(uploadMoney, 0)) AS notUploadMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - uploadMoney) AS unuploaded_rebate,
+                     0 AS fee,
+                     0 AS expense_payment,
+                     0 AS pending_payment,
+                     0 AS offset_payment,
+                     SUM(estimateRebate - uploadMoney) AS remaining_payment
+                 FROM anrui_scm.scm_collection_rebate
+                 GROUP BY LEFT(collectionDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1)
+             ) a
+            left join anrui_portal.sys_organization so on so.sid = a.division_name
+        WHERE a.year IS NOT NULL AND a.year != ''
+        GROUP BY a.year, a.division_name
+        ORDER BY a.division_name desc, a.year DESC;
+
+    </select>
+
+    <select id="pcBrandList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.PcBrandVo">
+        SELECT
+            a.year,
+            a.brandSid,
+            a.brandName,
+            ROUND(SUM(a.estimateRebate), 2) AS estimate,
+            ROUND(SUM(a.uploadMoney), 2) AS upload,
+            ROUND(SUM(a.adjustmentMoney), 2) AS adjust,
+            ROUND(SUM(a.notUploadMoney), 2) AS notUploadMoney,
+            ROUND(SUM(a.fee), 2) AS fee,
+            ROUND(SUM(a.expense_payment), 2) AS expense_payment,
+            ROUND(SUM(a.pending_payment), 2) AS pending_payment,
+            ROUND(SUM(a.offset_payment), 2) AS offset_payment,
+            ROUND(SUM(a.remaining_payment), 2) AS remaining_payment,
+            ROUND(SUM(a.unuploaded_rebate), 2) AS unuploaded_rebate
+        FROM (
+                 SELECT
+                     brandSid,
+                     brandName,
+                     LEFT(palceGenDate, 4) AS year,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_veh_rebate
+                 where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{sybSid}
+                 GROUP BY LEFT(palceGenDate, 4),brandSid
+
+                 UNION ALL
+
+                 SELECT
+                     brandSid,
+                     brandName,
+                     LEFT(palceGenDate, 4) AS year,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_special_rebate
+                 where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{sybSid}
+                 GROUP BY LEFT(palceGenDate, 4), brandSid
+
+                 UNION ALL
+
+                 SELECT
+                     brandSid,
+                     brandName,
+                     LEFT(collectionDate, 4) AS year,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - IFNULL(uploadMoney, 0)) AS notUploadMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - uploadMoney) AS unuploaded_rebate,
+                     0 AS fee,
+                     0 AS expense_payment,
+                     0 AS pending_payment,
+                     0 AS offset_payment,
+                     SUM(estimateRebate - uploadMoney) AS remaining_payment
+                 FROM anrui_scm.scm_collection_rebate
+                 where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{sybSid}
+                 GROUP BY LEFT(collectionDate, 4), brandSid
+             ) a
+        WHERE a.year IS NOT NULL AND a.year != ''
+        GROUP BY a.year, a.brandSid
+        ORDER BY a.brandSid desc, a.year DESC;
+
+    </select>
+
+    <select id="pcFgsList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.PcFgsVo">
+        SELECT
+            a.year,
+            a.division_name fgsSid,
+            so.name fgsName,
+            ROUND(SUM(a.estimateRebate), 2) AS estimate,
+            ROUND(SUM(a.uploadMoney), 2) AS upload,
+            ROUND(SUM(a.adjustmentMoney), 2) AS adjust,
+            ROUND(SUM(a.notUploadMoney), 2) AS notUploadMoney,
+            ROUND(SUM(a.fee), 2) AS fee,
+            ROUND(SUM(a.expense_payment), 2) AS expense_payment,
+            ROUND(SUM(a.pending_payment), 2) AS pending_payment,
+            ROUND(SUM(a.offset_payment), 2) AS offset_payment,
+            ROUND(SUM(a.remaining_payment), 2) AS remaining_payment,
+            ROUND(SUM(a.unuploaded_rebate), 2) AS unuploaded_rebate
+        FROM (
+                 SELECT
+                     LEFT(palceGenDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_veh_rebate
+                 where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
+                 GROUP BY LEFT(palceGenDate, 4),SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
+
+                 UNION ALL
+
+                 SELECT
+                     LEFT(palceGenDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_special_rebate
+                 where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
+                 GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
+
+                 UNION ALL
+
+                 SELECT
+                     LEFT(collectionDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - IFNULL(uploadMoney, 0)) AS notUploadMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - uploadMoney) AS unuploaded_rebate,
+                     0 AS fee,
+                     0 AS expense_payment,
+                     0 AS pending_payment,
+                     0 AS offset_payment,
+                     SUM(estimateRebate - uploadMoney) AS remaining_payment
+                 FROM anrui_scm.scm_collection_rebate
+                 where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
+                 GROUP BY LEFT(collectionDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
+             ) a
+            left join anrui_portal.sys_organization so on so.sid = a.division_name
+        WHERE a.year IS NOT NULL AND a.year != ''
+        GROUP BY a.year,a.division_name
+        ORDER BY a.division_name desc, a.year DESC;
+    </select>
 </mapper>

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<PagerVo<PcSybVo>> pcSybList(PagerQuery<PcSybQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PcSybVo> pv = factoryDaliyReportService.pcSybList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<PagerVo<PcBrandVo>> pcBrandList(PagerQuery<PcBrandQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PcBrandVo> pv = factoryDaliyReportService.pcBrandList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<PagerVo<PcFgsVo>> pcFgsList(PagerQuery<PcFgsQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PcFgsVo> pv = factoryDaliyReportService.pcFgsList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
 }

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<FactoryDaliyReportVo> factoryDaliyReportVoList = factoryDaliyReportMapper.getFsg2(fgsSid,year);
         return null;
     }
+
+    public PagerVo<PcSybVo> pcSybList(PagerQuery<PcSybQuery> pagerQuery) {
+        PcSybQuery query = pagerQuery.getParams();
+        QueryWrapper<PcSybVo> qw = new QueryWrapper<>();
+        if (query != null) {
+
+        }
+        IPage<PcSybVo> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<PcSybVo> pagging = factoryDaliyReportMapper.pcSybList(page, qw);
+        List<PcSybVo> 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<PcSybVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<PcBrandVo> pcBrandList(PagerQuery<PcBrandQuery> pagerQuery) {
+        PcBrandQuery query = pagerQuery.getParams();
+        QueryWrapper<PcBrandVo> qw = new QueryWrapper<>();
+        String sybSid = "";
+        if (query != null) {
+            sybSid = query.getSybSid();
+        }
+        IPage<PcBrandVo> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<PcBrandVo> pagging = factoryDaliyReportMapper.pcBrandList(page, sybSid);
+        List<PcBrandVo> 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<PcBrandVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<PcFgsVo> pcFgsList(PagerQuery<PcFgsQuery> pagerQuery) {
+        PcFgsQuery query = pagerQuery.getParams();
+        QueryWrapper<PcFgsVo> qw = new QueryWrapper<>();
+        String sybSid = "";
+        if (query != null) {
+            sybSid = query.getSybSid();
+        }
+        IPage<PcFgsVo> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<PcFgsVo> pagging = factoryDaliyReportMapper.pcFgsList(page, sybSid);
+        List<PcFgsVo> 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<PcFgsVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }