From 18c82cbbb3db608be90f795314c6b790917c63cb Mon Sep 17 00:00:00 2001
From: mzr <1562242162@qq.com>
Date: Wed, 30 Oct 2024 17:48:23 +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-=E5=A2=9E=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/stock/StockReportController.java   | 12 ++---
 .../stock/ClientStockReportMapper.xml         | 50 ++-----------------
 2 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
index fd6953e..9229bc6 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
@@ -140,12 +140,12 @@ public class StockReportController extends BaseController {
             HttpServletRequest request) {
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
-        // String token = request.getHeader("token");
-        // if (!redisService.isKey(token)) {
-        //     return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
-        // }
-        // Map<String, String> tokenMap = redisService.hmget(token);
-        // params.put("companyId", tokenMap.get("companyId"));
+        String token = request.getHeader("token");
+        if (!redisService.isKey(token)) {
+            return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
+        }
+        Map<String, String> tokenMap = redisService.hmget(token);
+        params.put("companyId", tokenMap.get("companyId"));
         params.put("startDate", startDate);
         params.put("endDate", endDate);
         params.put("clientId", clientId);
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 4ad2764..bec5dc3 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
@@ -35,47 +35,6 @@
         <result column="area_name" property="areaName" jdbcType="VARCHAR" />
     </resultMap>
 
-    <!-- 表查询字段 -->
-    <sql id="allColumns">
-        a.id, a.bill_id, a.bill_no, a.bill_date, a.client_id, a.confirm_status, a.create_time, a.goods_id, 
-        a.goods_no, a.last_num, a.count_num, a.diff_num, a.company_id, a.remark, a.prod_date,a.join_fhd_num,
-    </sql>
-
-    <!-- 根据条件参数查询盘点子表列表 -->
-    <select id="findCrmInventoryDetailByCondition" resultMap="stockReportMap" parameterType="map">
-        SELECT
-            <include refid="allColumns" />
-            b.goods_name, b.unit_id, b.unit_name, b.specifications, b.goods_type_id, b.goods_type_name
-        FROM crm_inventory_detail a
-        LEFT JOIN crm_goods_info b ON a.goods_no = b.goods_no and a.company_id = b.company_id
-        <where>
-            <if test="billId != null and billId != ''">
-                AND a.bill_id = #{billId}
-            </if>
-            <if test="clientId != null and clientId != ''">
-                AND a.client_id = #{clientId}
-            </if>
-            <if test="confirmStatus != null and confirmStatus != ''">
-                AND a.confirm_status = #{confirmStatus}
-            </if>
-            <if test="goodsNo != null and goodsNo != ''">
-                AND a.goods_no = #{goodsNo}
-            </if>
-            <if test="companyId != null and companyId != ''">
-                AND a.company_id = #{companyId}
-            </if>
-            <if test="startDateP != null and startDateP !=''">
-                AND TO_CHAR(TO_DATE(SUBSTR(a.prod_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &gt;=
-                TO_CHAR(TO_DATE(SUBSTR(#{startDateP},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
-            </if>
-            <if test="endDateP != null and endDateP !=''">
-                AND TO_CHAR(TO_DATE(SUBSTR(a.prod_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &lt;=
-                TO_CHAR(TO_DATE(SUBSTR(#{endDateP},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
-            </if>
-        </where>
-        ORDER BY a.bill_date DESC,a.create_time DESC
-    </select>
-
     <!-- 客户库存盘点明细 -->
     <select id="getClientStockReportSql" resultType="map" parameterType="map">
         SELECT t0.uecode "uecode",
@@ -99,7 +58,7 @@
         b.goods_num
         FROM crm_inventory_info a
         LEFT JOIN pd1 b ON a.id = b.bill_id
-        WHERE a.confirm_status = '1'
+        WHERE a.confirm_status = '1' AND a.company_id = #{companyId}
         <if test="startDate != null and startDate !=''">
             AND TO_CHAR(TO_DATE(SUBSTR(a.bill_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &gt;=
             TO_CHAR(TO_DATE(SUBSTR(#{startDate},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
@@ -114,7 +73,7 @@
         ) t1 ON t0.id = t1.client_id
         LEFT JOIN (SELECT client_id, COUNT(1) bill_num
         FROM crm_inventory_info
-        WHERE confirm_status = '1'
+        WHERE confirm_status = '1' AND company_id = #{companyId}
         <if test="startDate != null and startDate !=''">
             AND TO_CHAR(TO_DATE(SUBSTR(bill_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &gt;=
             TO_CHAR(TO_DATE(SUBSTR(#{startDate},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
@@ -124,9 +83,8 @@
             TO_CHAR(TO_DATE(SUBSTR(#{endDate},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
         </if>
         GROUP BY client_id) t2 ON t0.id = t2.client_id
-        WHERE t0.status = '1'
-        AND t0.documents_status = '1'
-        AND t0.uecode IS NOT NULL
+        WHERE t0.status = '1' AND t0.documents_status = '1'
+        AND t0.uecode IS NOT NULL AND t0.company_id = #{companyId}
     </select>
 
 </mapper>
\ No newline at end of file