From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面

---
 cnas-process/src/main/resources/mapper/ProcessReportMapper.xml |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index 3209130..9a09a28 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -18,15 +18,7 @@
         <result column="update_user" property="updateUser"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
-    <select id="pageProcessReport" resultType="com.yuanchu.mom.pojo.ProcessReport">
-        select * from (select cpr.* ,
-        u1.name sendUserName
-        from cnas_process_report cpr
-        left join user u1 on send_user=u1.id )A
-        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
-            ${ew.customSqlSegment}
-        </if>
-    </select>
+
     <select id="getIds" resultType="com.yuanchu.mom.pojo.ProcessReport">
         select cpr.* ,
         u1.name sendUserName
@@ -38,4 +30,14 @@
             #{id}
         </foreach>
     </select>
+
+    <select id="pageProcessReport" resultType="com.yuanchu.mom.pojo.ProcessReport">
+        select * from (select cpr.* ,
+        u1.name sendUserName
+        from cnas_process_report cpr
+        left join user u1 on send_user=u1.id )A
+        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+            ${ew.customSqlSegment}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3