From 6a0dc784bbb637b2e07b4d7c135911501eba9e68 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, 24 Apr 2022 17:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xm/core/ctrl/XmTaskSbillController.java | 4 ++--
 .../mapper/xm/core/dao/XmTaskSbillDetailMapper.xml        | 2 +-
 .../mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java
index 9f60bfc7..15442511 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java
@@ -221,8 +221,8 @@ public class XmTaskSbillController {
 					//进行合并操作
 					for (Map<String, Object> toSetUserTask : toSetUserTasks) {
 						if(detail.getUserid().equals(toSetUserTask.get("userid")) && detail.getTaskId().equals(toSetUserTask.get("taskId"))){
-							detail.setWorkload(detail.getWorkload().add(NumberUtil.getBigDecimal(toSetUserTask.get("workload"),BigDecimal.ZERO)));
-							detail.setWorkload(detail.getSworkload().add(NumberUtil.getBigDecimal(toSetUserTask.get("workload"),BigDecimal.ZERO)));
+							detail.setWorkload(NumberUtil.getBigDecimal(detail.getWorkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(toSetUserTask.get("workload"),BigDecimal.ZERO)));
+							detail.setSworkload(NumberUtil.getBigDecimal(detail.getSworkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(toSetUserTask.get("workload"),BigDecimal.ZERO)));
 						}
 					}
 				}
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml
index 95897f87..cae7a6ea 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml
@@ -30,7 +30,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_task_sbill_detail res
+		select res.*,t.name as task_name,t.project_name,t.task_state from xm_task_sbill_detail res left join xm_task t on t.task_id=res.task_id
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
index d052fb89..ecd7efc9 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
@@ -155,10 +155,10 @@
 		from xm_task_workload res
 		<where>
 			<if test="projectId!=null and projectId!=''">
-				and task.project_id=#{projectId}
+				and res.project_id=#{projectId}
 			</if>
 			<if test="taskId!=null and taskId!=''">
-				and task.id=#{taskId}
+				and res.id=#{taskId}
 			</if>
 			<if test="userid!=null and userid!=''">
 				and res.userid=#{userid}
@@ -191,8 +191,8 @@
 	</select>
 	<update id="updateStatusAfterJoinSbill" parameterType="List">
 		<foreach collection="list" item="item" index="index" separator=";" >
-			update xm_task_workload res set res.sstatus='2'
-			where res.sstatus='1' and res.userid=#{userid} and res.task_id=#{taskId}
+			update xm_task_workload res set res.sstatus='2',res.detail_id=#{item.id}
+			where res.sstatus='1' and res.userid=#{item.userid} and res.task_id=#{item.taskId}
 		</foreach>
 	</update>
 	<!--结束 自定义sql函数区域-->