From 8ee78175a7eb08457efea2b385db404ba6fc91a6 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 15 May 2025 16:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86=E5=88=A9?=
 =?UTF-8?q?=E6=B6=A6=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java             |  4 ++-
 .../api/carsSoldProfit/CarsSoldProfit.java    |  4 ---
 .../api/carsSoldProfit/CarsSoldProfitDto.java |  4 ---
 .../carsSoldProfit/CarsSoldProfitQuery.java   |  2 +-
 .../api/carsSoldProfit/CarsSoldProfitVo.java  | 12 ++++++---
 .../carsSoldProfit/CarsSoldProfitMapper.xml   | 24 ++++++++++++++++-
 .../carsSoldProfit/CarsSoldProfitService.java | 26 +++++++++----------
 7 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 7025535c34..0bdcbb36bb 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1432,10 +1432,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 //销售日期
                 carsSoldProfitDto.setSaleDate(baseVehicle.getSalesDate());
                 //车架号
-                carsSoldProfitDto.setVinNo(baseVehicle.getVinNo());
+                carsSoldProfitDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+                carsSoldProfitDto.setVinSid(baseVehicle.getSid());
                 //车型
                 carsSoldProfitDto.setVehModelSid(baseVehicle.getModelSid());
                 carsSoldProfitDto.setVehMConfigSid(baseVehicle.getModelConfigSid());
+                //采购系统
                 carsSoldProfitDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
                 carsSoldProfitDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
                 //入库价
diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java
index 560aea445b..323f0a8482 100644
--- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java
+++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java
@@ -47,8 +47,6 @@ public class CarsSoldProfit extends BaseEntity {
     private String locationSid;
     @ApiModelProperty("存放地点")
     private String locationName;
-    @ApiModelProperty("采购类型")
-    private String type;
     @ApiModelProperty("出库价")
     private BigDecimal exStockPrice;
     @ApiModelProperty("预计毛利")
@@ -71,8 +69,6 @@ public class CarsSoldProfit extends BaseEntity {
     private BigDecimal moveCarPrice;
     @ApiModelProperty("排产订单编号")
     private String schedulingId;
-    @ApiModelProperty("变速箱")
-    private String gearbox;
     @ApiModelProperty("数据日期")
     private Date createDate;
     @ApiModelProperty("更新日期")
diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
index 28279c0f5a..f7c055790e 100644
--- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
+++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
@@ -45,8 +45,6 @@ public class CarsSoldProfitDto {
     private String locationSid;
     @ApiModelProperty("存放地点")
     private String locationName;
-    @ApiModelProperty("采购类型")
-    private String type;
     @ApiModelProperty("出库价")
     private String exStockPrice;
     @ApiModelProperty("预计毛利")
@@ -69,8 +67,6 @@ public class CarsSoldProfitDto {
     private String moveCarPrice;
     @ApiModelProperty("排产订单编号")
     private String schedulingId;
-    @ApiModelProperty("变速箱")
-    private String gearbox;
     @ApiModelProperty("数据日期")
     private Date createDate;
     @ApiModelProperty("更新日期")
diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitQuery.java
index 8b559bfa3a..c257346de0 100644
--- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitQuery.java
+++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitQuery.java
@@ -15,7 +15,7 @@ public class CarsSoldProfitQuery implements Query {
     @ApiModelProperty("菜单sid")
     private String menuSid;
     @ApiModelProperty("机构组织全路径")
-    private String orgSidPath;
+    private String orgPath;
     @ApiModelProperty("搜索分公司、车架号、车型、排产订单、销售专员")
     private String names;
 
diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java
index a31ed77a1d..03462120a5 100644
--- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java
+++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitVo.java
@@ -27,7 +27,8 @@ public class CarsSoldProfitVo {
     @ApiModelProperty("事业部")
     private String division;
     @ApiModelProperty("车型")
-    private String model;
+    @JsonProperty("model")
+    private String vehicleAlias;
 
     @ApiModelProperty("采购系统")
     @JsonProperty("buySystem")
@@ -58,14 +59,17 @@ public class CarsSoldProfitVo {
     private String moveCarPrice;
 
     @ApiModelProperty("变速箱")
-    private String gearbox;
+    @JsonProperty("gearbox")
+    private String gearboxTypeValue;
     @ApiModelProperty("排产订单编号")
     private String schedulingId;
 
     @ApiModelProperty("数据日期")
-    private String dataTime;
+    @JsonProperty("dataTime")
+    private String createDate;
     @ApiModelProperty("更新日期")
-    private String updateTime;
+    @JsonProperty("updateTime")
+    private String updateDate;
     
     private String sid;
 }
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml
index 650a8a5697..03146f65b5 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml
@@ -8,7 +8,29 @@
     </select>
 
     <select id="listPage" resultType="com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo">
-        select * from cars_sold_profit
+        select cp.staffName,
+        cp.customerName,
+        DATE_FORMAT(cp.saleDate,'%Y-%m-%d') as saleDate,
+        cp.useOrgName,
+        cp.division,
+        cp.purchaseSystemName,
+        cp.vinNo,
+        cp.exStockPrice,
+        cp.expectedMaori,
+        cp.rebatesAdjust,
+        cp.adjustedMaori,
+        cp.makersSettlementPrice,
+        cp.rebatesTotal,
+        cp.carCost,
+        cp.financeServiceCharge,
+        cp.mediatorRebatePrice,
+        cp.schedulingId,
+        cp.createDate,
+        cp.updateDate,
+        bm.gearboxTypeValue,
+        bm.vehicleAlias
+        from cars_sold_profit cp
+        left join anrui_base.base_vehicle_model bm on bm.sid = cp.vehModelSid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
index 86337e7292..58d58df50c 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
@@ -74,13 +74,13 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
             if (StringUtils.isNotBlank(query.getMenuSid())) {
                 //=======================
                 PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-                privilegeQuery.setOrgPath(query.getOrgSidPath());
+                privilegeQuery.setOrgPath(query.getOrgPath());
                 privilegeQuery.setMenuSid(query.getMenuSid());
                 privilegeQuery.setUserSid(query.getUserSid());
                 ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
                 if (org.apache.commons.lang3.StringUtils.isNotBlank(defaultIdReltBean.getData())) {
                     //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                    String orgSidPath = query.getOrgSidPath();
+                    String orgSidPath = query.getOrgPath();
                     orgSidPath = orgSidPath + "/";
                     int i1 = orgSidPath.indexOf("/");
                     int i2 = orgSidPath.indexOf("/", i1 + 1);
@@ -89,16 +89,16 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
                     String orgLevelKey = defaultIdReltBean.getData();
                     if ("1".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i1);
-                        qw.like("bd.orgSidPath", orgSidPath);
+                        qw.like("cp.orgSidPath", orgSidPath);
                     } else if ("2".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i2);
-                        qw.like("bd.orgSidPath", orgSidPath);
+                        qw.like("cp.orgSidPath", orgSidPath);
                     } else if ("3".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i3);
-                        qw.like("bd.orgSidPath", orgSidPath);
+                        qw.like("cp.orgSidPath", orgSidPath);
                     } else if ("4".equals(orgLevelKey)) {
                         orgSidPath = orgSidPath.substring(0, i4);
-                        qw.like("bd.orgSidPath", orgSidPath);
+                        qw.like("cp.orgSidPath", orgSidPath);
                     } else {
                         PagerVo<CarsSoldProfitVo> p = new PagerVo<>();
                         return p;
@@ -113,21 +113,21 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
                 String[] s = date.split("至");
                 String startDate = s[0];
                 if (StringUtils.isNotBlank(startDate)) {
-                    qw.ge("saleDate", startDate);
+                    qw.ge("cp.saleDate", startDate);
                 }
                 String endDate = s[1];
                 if (StringUtils.isNotBlank(endDate)) {
-                    qw.le("saleDate", endDate);
+                    qw.le("cp.saleDate", endDate);
                 }
             }
             String names = query.getNames();
             // 多字段模糊查询
             if (StringUtils.isNotBlank(names)) {
-                qw.and(wrapper -> wrapper.like("useOrgName", names)
-                        .or().like("vinNo", names)
-                        .or().like("model", names)
-                        .or().like("schedulingId", names)
-                        .or().like("staffName", names));
+                qw.and(wrapper -> wrapper.like("cp.useOrgName", names)
+                        .or().like("cp.vinNo", names)
+                        .or().like("cp.vehModel", names)
+                        .or().like("cp.schedulingId", names)
+                        .or().like("cp.staffName", names));
 
 
             }