Merge remote-tracking branch 'origin/master'

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(业务管理) <br/>
- * File: BusDeliveredFeignFallback.java <br/>
- * Class: com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredRest <br/>
- * Description: 待出库车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-24 10:21:44 <br/>
- *
- * @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 {
 

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<FactoryDaliyReportVo> pageList1(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
-*/
+    /* @PostMapping("/pageList")
+     @ResponseBody
+     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.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<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;
+    }
 }

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;

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;

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;

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;

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<LoanLawsuitApply
                     pushCaseDto.setVehList(vehList);
                 }
                 LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(lawsuitApply.getLoanSid());
-                pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
-                pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
+               if(loanHomevisitInvestigateCustomerDetailsVo != null){
+                   pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
+                   pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
+               }
                 pushCaseDto.setIsZfull("0");
                 loanCaseProgressService.pushCase(pushCaseDto);
             } else {

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<LoanRepurchas
     private FinPaymentrecordFeign finPaymentrecordFeign;
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private LoanFinBankService loanFinBankService;
 
     public PagerVo<LoanRepurchaseApplyVo> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
         IPage<LoanRepurchaseApply> page = PagerUtil.queryToPage(pq);
@@ -867,6 +871,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                             }else{
                                 paymentMoney = bankSettlePrice;
                             }
+                            bankSettlePrice = bankSettlePrice.subtract(bankSettlePrice);
                             loanRepaymentPlanDetails.setPaymentMoney(paymentMoney);
                             loanRepaymentPlanDetailsService.updateById(loanRepaymentPlanDetails);
                         }
@@ -937,6 +942,10 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                     Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                     voucherResultDetailDtoDf.setSummary(loanRepurchaseApply.getBankName() + "个贷保证金抵结清款");
                     voucherResultDetailDtoDf.setSubjectNo("1009.01.00");
+                    LoanFinBank loanFinBank = loanFinBankService.fetchBySid(loanRepurchaseApply.getBankSid());
+                    if(loanFinBank != null){
+                        voucherResultDetailDtoDf.setBank(loanFinBank.getBankNo());
+                    }
                     //核算部门
                     voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
                     //核算客户

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<LoanSe
     private LoanReturnVehLedgerService loanReturnVehLedgerService;
     @Autowired
     private SysNoticeFeign sysNoticeFeign;
+    @Autowired
+    private LoanSecondarySalesBiddingService loanSecondarySalesBiddingService;
 
     public ResultBean saveSalesCustomer(LoanSecondarySalesCustomerDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -174,7 +177,14 @@ public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSe
         salesInitVo.setCreateDept(loanSecondarySalesApply.getCreateDept());
         salesInitVo.setSaleDate(loanSecondarySalesApply.getCloseDate());
         LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(sid);
-        salesInitVo.setSalePrice(loanSecondarySalesCost.getVehPrice().toString());
+
+        //补充信息的最终价格-取竞价结果的最高价格
+        LoanSecondarySalesBidding loanSecondarySalesBidding = loanSecondarySalesBiddingService.selectByMainSid(sid);
+        if(loanSecondarySalesBidding != null){
+            salesInitVo.setSalePrice(loanSecondarySalesBidding.getPrice().toString());
+        }else{
+            salesInitVo.setSalePrice(loanSecondarySalesCost.getVehPrice().toString());
+        }
         if(loanSecondarySalesCustomer != null){
             String contractFiles = loanSecondarySalesCustomer.getContractFiles();
             String otherFiles = loanSecondarySalesCustomer.getOtherFiles();

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<LoanSolutionsMapper
             if (StringUtils.isNotBlank(query.getProxyPurchasetax())) {
                 proxyTotal = proxyTotal.add(new BigDecimal(query.getProxyPurchasetax()));
             }
-            calculateVo.setProxyTotal(proxyTotal.toString());
         }
-
+        calculateVo.setProxyTotal(proxyTotal.toString());
         //应收合计 = 融资首付+贷款保证金+保险保证金+落户保证金+服务费+代收意外险+补车价+上牌费+运管费+其它费用
         BigDecimal receivableTotal = new BigDecimal(BigInteger.ZERO);
         receivableTotal = receivableTotal.add(new BigDecimal(calculateVo.getDownPayAmounts()));
@@ -1702,9 +1701,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 offsetTotal = offsetTotal.add(new BigDecimal(offsetPurchasetax));
             }
             offsetTotal = offsetTotal.add(offsetAccessoriesBig);
-            calculateVo.setOffsetTotal(offsetTotal.toString());
-        }
 
+        }
+        calculateVo.setOffsetTotal(offsetTotal.toString());
 
         //实收合计 = 应收合计-抵顶合计
         BigDecimal realTotal = receivableTotal.subtract(offsetTotal);
@@ -2582,6 +2581,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                             return rb.setMsg("抵顶首年保险费不能超过保险费用");
                         }
                     }
+                    solutionssVo.setProxyPremium(premium);//代收首年保险费
                 }
             } else {
                 if (StringUtils.isNotBlank(query.getOffsetPremium())) {
@@ -2602,6 +2602,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                             return rb.setMsg("抵顶购置税不能超过购置税");
                         }
                     }
+                    solutionssVo.setProxyPurchasetax(purchaseTax);//代收购置税
                 }
 
             } else {