From 074c727235a328a7e692e1b5c2926c29ea76006a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 22 Apr 2022 01:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xm/core/entity/XmTaskSbill.java  |  6 +--
 .../mapper/xm/core/dao/XmTaskSbillMapper.xml  | 53 +++++++++++++------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
index fcd938d0..a2ec1286 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbill.java
@@ -62,7 +62,7 @@ public class XmTaskSbill  implements java.io.Serializable {
 	@ApiModelProperty(notes="业务日期yyyy-MM-dd",allowEmptyValue=true,example="",allowableValues="")
 	String bizDate;
 	
-	@ApiModelProperty(notes="结算流程状态",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="结算流程状态：0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
 	String bizFlowState;
 	
 	@ApiModelProperty(notes="结算流程实例",allowEmptyValue=true,example="",allowableValues="")
@@ -177,7 +177,7 @@ public class XmTaskSbill  implements java.io.Serializable {
 		this.bizDate = bizDate;
 	}
 	/**
-	 * 结算流程状态
+	 * 结算流程状态：0初始1审批中2审批通过3审批不通过4流程取消或者删除
 	 **/
 	public void setBizFlowState(String bizFlowState) {
 		this.bizFlowState = bizFlowState;
@@ -304,7 +304,7 @@ public class XmTaskSbill  implements java.io.Serializable {
 		return this.bizDate;
 	}
 	/**
-	 * 结算流程状态
+	 * 结算流程状态：0初始1审批中2审批通过3审批不通过4流程取消或者删除
 	 **/
 	public String getBizFlowState() {
 		return this.bizFlowState;
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml
index 8a5fe8a3..f569f25e 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml
@@ -5,19 +5,20 @@
 	
 	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
 
-		<sql id="whereForMap">
-            <if test="ids != null">  and (res.id) in
-                    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-                        ( #{id})
-                    </foreach>
-             </if>
-		    <if test="key != null and key !='' ">
-			 	AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} )
-			</if>
-			<if test="startTime !=null and startTime != ''">
-				AND res.ctime BETWEEN #{startTime} AND #{endTime}
-			</if>
-		</sql>
+    <sql id="whereForMap">
+         <if test=" ids != null">  and (res.id) in
+             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+         </if>
+
+		<if test="key != null and key !='' ">
+			AND( res.id like #{key} OR res.title like #{key} OR res.project_name like #{key} )
+		</if>
+		<if test="startTime !=null and startTime != ''">
+			AND res.ctime BETWEEN #{startTime} AND #{endTime}
+		</if>
+    </sql>
 
 	<update id="updateByWorkloadList" parameterType="String">
 		update xm_task_sbill res left join (select w.sbill_id,sum(ifnull(w.amt,0)) as amt,sum(ifnull(w.samt,0)) as samt,sum(ifnull(w.workload,0)) as workload from xm_task_workload w  where w.sbill_id=#{id} and w.wstatus='1' group by w.sbill_id) as w on res.id=w.sbill_id
@@ -53,7 +54,13 @@
 		where 
 			res.id = #{id}
 	</select>
-	
+    <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTaskSbill">
+        select * from xm_task_sbill res
+        where  (res.id) in
+             <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+    </select>
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_task_sbill res
@@ -62,7 +69,7 @@
 	</select>
 	<!-- 获取数据条目 返回long -->
 	<select id="countByWhere" parameterType="com.xm.core.entity.XmTaskSbill" resultType="long">
-		select count(1) from xm_task_sbill res
+		select count(*) from xm_task_sbill res
 		<where>
 			<include refid="where"/>
 		</where>
@@ -78,9 +85,9 @@
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmTaskSbill">
-		delete from xm_task_sbill
+		delete from xm_task_sbill res
 		<where>  
-			1=2
+			<include refid="where"/>
 		</where>
 	</delete>
 	
@@ -122,6 +129,18 @@
 			where id = #{item.id}  
 		</foreach> 
 	</update>
+
+	<!-- 批量修改某几个字段 -->
+	<delete id="editSomeFields" parameterType="HashMap">
+		update  xm_task_sbill
+        <set>
+            <include refid="someFieldSet"/>
+        </set>
+        where  (id) in
+             <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+	</delete>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
 		delete from xm_task_sbill