From 661b9704c9fa32ac56d294119197bbbcf9031cc1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 2 Jun 2024 17:05:44 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisTmsScanRecordController.java |  4 +--
 .../mapper/EmisTmsScanRecordMapper.xml        | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index 9ace430d7..de44187ca 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -81,8 +81,8 @@ public class EmisTmsScanRecordController extends BaseController
      * 签收异常数据对比
      */
 //    @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:signStat')")
-    @GetMapping("/queryScanStatDataList")
-    public TableDataInfo queryScanStatDataList(EmisTmsScanRecord emisTmsScanRecord)
+    @GetMapping("/queryScanStatList")
+    public TableDataInfo queryScanStatList(EmisTmsScanRecord emisTmsScanRecord)
     {
         startPage();
         emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode());
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index fffa000ae..f74a86d35 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -57,8 +57,7 @@
 
     </resultMap>
 
-    <!--    扫描统计 com.xdadan.erp.emis.domain.stat.-->
-    <resultMap type="ScanStatDataInfo" id="ScanStatDataInfoResult" extends="EmisTmsScanRecordResult">
+    <resultMap type="ScanStatDataInfo" id="ScanStatDataInfoResult">
 
         <result property="scanType"    column="scan_type"    />
 
@@ -68,12 +67,6 @@
 
         <result property="billCodeStr"    column="bill_code_str"    />
 
-        <association property="signCount"
-                     column="bill_code_str"
-                     select="selectSignCountByBillCodeStr"
-                     fetchType="lazy"
-        />
-
         <association property="scanSiteName"
                      column="scan_site_code"
                      select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"
@@ -83,6 +76,12 @@
 
     </resultMap>
 
+<!--    <association property="signCount"-->
+<!--                 column="bill_code_str"-->
+<!--                 select="selectSignCountByBillCodeStr"-->
+<!--                 fetchType="lazy"-->
+<!--    />-->
+
 
     <!--  根据获取签收数量统计 -->
     <select id="selectSignCountByBillCodeStr" parameterType="string" resultType="int">
@@ -109,15 +108,17 @@
         <if test="params.endScanDate != null and params.endScanDate != ''">
             and scan_date <![CDATA[ <= ]]>  #{params.endScanDate}
         </if>
-        <if test="params.thisSiteScanType != null and params.thisSiteScanType !=''">
-            and bill_code in(
-                select bill_code from emis_tms_scan_record where scan_site_code=#{params.thisSiteCode} and scan_type=#{params.thisSiteScanType}
-            )
-        </if>
+
         GROUP BY scan_site_code
 
     </select>
 
+<!--    <if test="params.thisSiteScanType != null and params.thisSiteScanType !=''">-->
+<!--        and bill_code in(-->
+<!--        select bill_code from emis_tms_scan_record where scan_site_code=#{params.thisSiteCode} and scan_type=#{params.thisSiteScanType}-->
+<!--        )-->
+<!--    </if>-->
+
     <select id="queryScanStatRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
         select distinct scan_site_code,bill_code
         from emis_tms_scan_record