From 66c8e330eec939244c79b00db8ff108668bd363a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 15 May 2022 23:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xm/core/dao/XmTaskMapper.xml       | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index bf9140b1..cb3456f9 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -324,24 +324,6 @@
 		res.task_state=ifnull(#{taskState},res.task_state)
 		where id=#{id}
 	</update>
-
-	<update id="editSomeFields" parameterType="HashMap">
-		update  xm_task res
-		<set>
-			<include refid="someFieldSet"/>
-			<if test="taskState!=null and taskState!=''">
-				res.rate=case when res.task_state in('2','3','4') then 100
-				when res.budget_workload>0 then ifnull(res.act_workload,0)*100/ res.budget_workload
-				when res.act_workload>0 then 100
-				else res.rate end
-			</if>
-		</set>
-		where id in
-		<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-			#{item}
-		</foreach>
-	</update>
-
 	<update id="calcWorkloadByRecord" parameterType="List">
 		update xm_task res left join
 		(select w.task_id, sum(ifnull(w.workload,0)) as workload  from xm_task_workload w where w.task_id  in
@@ -513,16 +495,23 @@
 	</update>
 
 	<!-- 批量修改某几个字段 -->
-	<delete id="editSomeFields" parameterType="HashMap">
-		update  xm_task
-        <set>
-            <include refid="someFieldSet"/>
-        </set>
-        where  (id) in
-             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-                 ( #{item})
-             </foreach>
-	</delete>
+
+	<update id="editSomeFields" parameterType="HashMap">
+		update  xm_task res
+		<set>
+			<include refid="someFieldSet"/>
+			<if test="taskState!=null and taskState!=''">
+				res.rate=case when res.task_state in('2','3','4') then 100
+				when res.budget_workload>0 then ifnull(res.act_workload,0)*100/ res.budget_workload
+				when res.act_workload>0 then 100
+				else res.rate end
+			</if>
+		</set>
+		where id in
+		<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+			#{item}
+		</foreach>
+	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
 		delete from xm_task