From 5d9faa9846195f8ad1002e8250ef2f69b66a2695 Mon Sep 17 00:00:00 2001
From: chentaiyu <chentaiyu@xx.com>
Date: Wed, 30 Mar 2022 20:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=93=E7=AE=97-=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/ctrl/XmTaskWorkloadController.java   | 26 ++++++++++++++++-
 .../xm/core/dao/XmTaskWorkloadMapper.xml      | 29 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
index 8c4d4055..e24d8309 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
@@ -81,6 +81,8 @@ public class XmTaskWorkloadController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		RequestUtils.transformArray(xmTaskWorkload, "ids");
+		RequestUtils.transformArray( xmTaskWorkload, "wstatuses");
+		RequestUtils.transformArray( xmTaskWorkload, "sstatuses");
 		PageUtils.startPage(xmTaskWorkload);
 		List<Map<String,Object>>	xmTaskWorkloadList = xmTaskWorkloadService.selectListMapByWhere(xmTaskWorkload);	//列出XmTaskWorkload列表
 		PageUtils.responePage(m, xmTaskWorkloadList);
@@ -328,7 +330,7 @@ public class XmTaskWorkloadController {
 		return m;
 	}
 
-	@ApiOperation( value = "根据主键修改一条工时登记表信息",notes=" ")
+	@ApiOperation( value = "",notes=" ")
 	@ApiResponses({
 			@ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
 	})
@@ -348,4 +350,26 @@ public class XmTaskWorkloadController {
 		m.put("tips", tips);
 		return m;
 	}
+
+	@ApiOperation( value = "修改工时表状态",notes=" ")
+	@ApiResponses({
+			@ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
+	})
+	@RequestMapping(value="/editXmWorkloadWstatus",method=RequestMethod.POST)
+	public Map<String,Object> editXmWorkloadWstatus(@RequestBody Map<String,Object> params) {
+		Map<String,Object> m = new HashMap<>();
+		Tips tips=new Tips("成功更新工时登记表状态");
+		try{
+
+			xmTaskWorkloadService.update("updateWorkloadWstatus",params);
+		}catch (BizException e) {
+			tips=e.getTips();
+			logger.error("",e);
+		}catch (Exception e) {
+			tips.setFailureMsg(e.getMessage());
+			logger.error("",e);
+		}
+		m.put("tips", tips);
+		return m;
+	}
 }
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 63129e51..7281e7d1 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
@@ -18,6 +18,21 @@
 		<if test="toSbill !=null and toSbill !=''">
 			AND  (res.wstatus = '1'AND res.sstatus = '1')
 		</if>
+		<if test ="wstatuses != null and wstatuses!=''">
+			AND res.wstatus IN
+			<foreach collection="wstatuses" item="item" index="index" open="(" separator="," close=")" >
+				 #{item}
+			</foreach>
+		</if>
+		<if test ="sstatuses != null and sstatuses!=''">
+			AND res.sstatus IN
+			<foreach collection="sstatuses" item="item" index="index" open="(" separator="," close=")" >
+				 #{item}
+			</foreach>
+		</if>
+		<if test="startTime!=null and startTime !=''">
+			AND res.ctime BETWEEN #{startTime} AND #{endTime}
+		</if>
     </sql>
 
 	<!-- 通过条件查询获取未提交结算的工作量 返回list<map> -->
@@ -46,6 +61,20 @@
 			res.sbill_id = #{sbillId}
 		</where>
 	</update>
+	<!-- 根据条件修改若干条记录 -->
+	<update id="updateWorkloadWstatus" parameterType="com.xm.core.entity.XmTaskWorkload">
+		update  xm_task_workload res
+		<set>
+			res.wstatus = #{wstatus}
+		</set>
+		<where>
+			<if test=" ids != null">  and (res.id) in
+				<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+					 #{item}
+				</foreach>
+			</if>
+		</where>
+	</update>
 	<!--结束 自定义sql函数区域-->