From 78cf4b37fe3de10c3601d0281f694bb1d96a7268 Mon Sep 17 00:00:00 2001
From: mzr <1562242162@qq.com>
Date: Sat, 2 Nov 2024 11:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BA=93=E5=AD=98=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stock/ClientStockReportMapper.xml            | 16 +++-------------
 .../webapp/stock/entity/ClientStockReport.java   |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
index 8d96b42..1dac4b7 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
@@ -3,15 +3,6 @@
 
 <!-- 客户盘点报表 -->
 <mapper namespace="com.yb.lb.webapp.stock.entity.ClientStockReport">
-    <!-- 字段映射 -->
-    <resultMap id="stockReportMap" type="com.yb.lb.webapp.stock.entity.ClientStockReport">
-        <result column="uecode" property="uecode" jdbcType="VARCHAR" />
-        <result column="bill_id" property="billId" jdbcType="VARCHAR" />
-        <result column="bill_no" property="billNo" jdbcType="VARCHAR" />
-        <result column="bill_date" property="billDate" jdbcType="VARCHAR" />
-        <result column="area_no" property="areaNo" jdbcType="VARCHAR" />
-        <result column="area_name" property="areaName" jdbcType="VARCHAR" />
-    </resultMap>
 
     <!-- 日期查询条件 -->
     <sql id="dateSel_a">
@@ -60,7 +51,7 @@
         FROM (
         SELECT client_id
         FROM crm_inventory_info
-        WHERE confirm_status = '1'
+        WHERE confirm_status = '1' AND company_id = #{companyId}
         <include refid="dateSel" />
         GROUP BY client_id
         ) table_client
@@ -206,9 +197,8 @@
         FROM (
                  SELECT goods_no
                  FROM crm_inventory_detail
-                 WHERE confirm_status = '1'
-                   AND company_id = #{companyId}
-                   AND client_id = #{clientId}
+                 WHERE confirm_status = '1' AND company_id = #{companyId} AND client_id = #{clientId}
+                 <include refid="dateSel" />
                  GROUP BY goods_no
              ) a
                  LEFT JOIN crm_goods_info b ON a.goods_no = b.goods_no and b.company_id = #{companyId}
diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java
index fe0a44b..bf36201 100644
--- a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java
+++ b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java
@@ -26,7 +26,7 @@ public class ClientStockReport implements java.io.Serializable {
 
     /** 客户名称 */
     @ApiModelProperty(value = "客户名称")
-    @Excel(name = "客户名称", width = 30, orderNum = "3")
+    @Excel(name = "客户名称", width = 35, orderNum = "3")
     private String clientName;
 
     /** 业务员名称 */