From 3c00fb91eb2f617922730e7d0c56ea0e1ad373e0 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期二, 05 九月 2023 18:23:29 +0800
Subject: [PATCH] 新增数据接入接口

---
 src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml b/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml
index 27e68c5..6a602ed 100644
--- a/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/AnalysisDataMapper.xml
@@ -119,22 +119,20 @@
 
 
     <!-- 鍘婚噸-->
-    <select id="search" resultType="Integer">
-        select count(*) from fm_web_analysis_data
+    <select id="search" resultType="com.job.zsc.pojo.AnalysisData">
+        select a.*,b.DI_Name,b.DI_Supplier
+        from fm_web_analysis_data as a join ea_t_device_info as b on a.fume_dev_id = b.DI_Code
         <where>
             <if test="shopname != null and shopname != '' ">
-                fume_dev_id=(select fume_dev_id
-                from shopname_data
-                where shop_name like concat('%',#{shopname},'%'))
+                a.fume_dev_id like concat('%',#{shopname},'%')
             </if>
             <if test="value != null and value != null">
-                or shop_name like concat('%',#{value},'%')
+                and b.DI_Name = #{value}
             </if>
 
             <if test="begin != null and end != null">
-                and (fume_date between #{begin} and #{end})
+                and a.fume_date between #{begin} and #{end}
             </if>
         </where>
-        group by fume_dev_id
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3