From 7a9de16c90c1d936c35d426c95c3f4a9bba8a1f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 十一月 2024 09:25:54 +0800
Subject: [PATCH] 电路试验的计算规则,将检验值转换成绝对值进行判定,不判定的情况加上要求值是中文

---
 performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml b/performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml
index 7d5b982..e3adc2f 100644
--- a/performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml
+++ b/performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml
@@ -18,6 +18,25 @@
         <result column="solidarity" property="solidarity" />
         <result column="proposal" property="proposal" />
         <result column="total" property="total" />
+        <result column="name" property="name" />
+        <result column="depart_lims" property="departLims" />
     </resultMap>
-
+    <select id="getEvaluateCompetent" resultType="com.yuanchu.mom.pojo.EvaluateCompetent">
+        select ec.*,u.name,
+        dl.name depart_lims
+        from evaluate_competent ec
+        left join evaluate e on ec.evaluate_id = e.id
+        left join user u on e.user_id = u.id
+        left join department_lims dl on FIND_IN_SET(dl.id, depart_lims_id)
+        where 1=1
+        <if test="month!=null and month!=''">
+            and e.month=#{month}
+        </if>
+        <if test="departLims!=null and departLims!=''">
+            and dl.name like concat ('%',#{departLims},'%')
+        </if>
+        <if test="name!=null and name!=''">
+            and u.name like concat ('%',#{name},'%')
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3