From f4f55202f15338631e2f9add0d72629bdf5f420d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 7 Apr 2022 03:16:18 +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

---
 .../com/xm/core/entity/XmTaskWorkload.java    | 31 ++++++++++++++-----
 .../xm/core/dao/XmTaskWorkloadMapper.xml      | 12 ++++---
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java
index f0ddc6b8..1afd8ec8 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskWorkload所有属性名: <br>
- *	userid,username,ctime,taskId,cuserid,bizDate,wstatus,remark,ttype,id,sbillId,stime,sstatus,amt,samt,workload,rworkload,cusername,projectId;<br>
+ *	userid,username,ctime,taskId,cuserid,bizDate,wstatus,remark,ttype,id,sbillId,stime,sstatus,amt,samt,workload,rworkload,cusername,projectId,sworkload;<br>
  * 表 xm_task_workload 工时登记表的所有字段名: <br>
- *	userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,sbill_id,stime,sstatus,amt,samt,workload,rworkload,cusername,project_id;<br>
+ *	userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,sbill_id,stime,sstatus,amt,samt,workload,rworkload,cusername,project_id,sworkload;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -62,13 +62,13 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	@ApiModelProperty(notes="工时对应金额",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal amt;
 	
-	@ApiModelProperty(notes="结算金额",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="结算工时对应结算金额",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal samt;
 	
 	@ApiModelProperty(notes="工时，一个task_id可多次提交，小时",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal workload;
 	
-	@ApiModelProperty(notes="剩余工时（同一天取最后日期更新到task表rworkload中）",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="剩余工时（同一天取最后日期更新到task表budget_workload中）",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal rworkload;
 	
 	@ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="")
@@ -76,6 +76,9 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="归属项目",allowEmptyValue=true,example="",allowableValues="")
 	String projectId;
+	
+	@ApiModelProperty(notes="结算工时，用于结算，默认=workload",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal sworkload;
 
 	/**主键**/
 	public XmTaskWorkload(String id) {
@@ -171,7 +174,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 		this.amt = amt;
 	}
 	/**
-	 * 结算金额
+	 * 结算工时对应结算金额
 	 **/
 	public void setSamt(BigDecimal samt) {
 		this.samt = samt;
@@ -183,7 +186,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 		this.workload = workload;
 	}
 	/**
-	 * 剩余工时（同一天取最后日期更新到task表rworkload中）
+	 * 剩余工时（同一天取最后日期更新到task表budget_workload中）
 	 **/
 	public void setRworkload(BigDecimal rworkload) {
 		this.rworkload = rworkload;
@@ -200,6 +203,12 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	public void setProjectId(String projectId) {
 		this.projectId = projectId;
 	}
+	/**
+	 * 结算工时，用于结算，默认=workload
+	 **/
+	public void setSworkload(BigDecimal sworkload) {
+		this.sworkload = sworkload;
+	}
 	
 	/**
 	 * 员工编号
@@ -286,7 +295,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 		return this.amt;
 	}
 	/**
-	 * 结算金额
+	 * 结算工时对应结算金额
 	 **/
 	public BigDecimal getSamt() {
 		return this.samt;
@@ -298,7 +307,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 		return this.workload;
 	}
 	/**
-	 * 剩余工时（同一天取最后日期更新到task表rworkload中）
+	 * 剩余工时（同一天取最后日期更新到task表budget_workload中）
 	 **/
 	public BigDecimal getRworkload() {
 		return this.rworkload;
@@ -315,5 +324,11 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	public String getProjectId() {
 		return this.projectId;
 	}
+	/**
+	 * 结算工时，用于结算，默认=workload
+	 **/
+	public BigDecimal getSworkload() {
+		return this.sworkload;
+	}
 
 }
\ No newline at end of file
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 4f548db4..5dfaba42 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
@@ -114,7 +114,7 @@
 		insert into xm_task_workload(
 			<include refid="columns"/>
 		) values (
-		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{sbillId},#{stime},#{sstatus},#{amt},#{samt},#{workload},#{rworkload},#{cusername},#{projectId}
+		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{sbillId},#{stime},#{sstatus},#{amt},#{samt},#{workload},#{rworkload},#{cusername},#{projectId},#{sworkload}
 		)
 	</insert>
 	
@@ -177,7 +177,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,sbill_id,stime,sstatus,amt,samt,workload,rworkload,cusername,project_id
+		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,sbill_id,stime,sstatus,amt,samt,workload,rworkload,cusername,project_id,sworkload
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -201,6 +201,7 @@
 		<if test="rworkload != null and rworkload != ''">      and res.rworkload = #{rworkload}     </if>
 		<if test="cusername != null and cusername != ''">      and res.cusername = #{cusername}     </if>
 		<if test="projectId != null and projectId != ''">      and res.project_id = #{projectId}     </if>
+		<if test="sworkload != null and sworkload != ''">      and res.sworkload = #{sworkload}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -221,7 +222,8 @@
 		workload = #{workload},
 		rworkload = #{rworkload},
 		cusername = #{cusername},
-		project_id = #{projectId}
+		project_id = #{projectId},
+		sworkload = #{sworkload}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="userid != null and userid != ''"> userid = #{userid},     </if>
@@ -242,6 +244,7 @@
 		<if test="rworkload != null and rworkload != ''"> rworkload = #{rworkload},     </if>
 		<if test="cusername != null and cusername != ''"> cusername = #{cusername},     </if>
 		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
+		<if test="sworkload != null and sworkload != ''"> sworkload = #{sworkload},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -262,6 +265,7 @@
 			workload = #{item.workload},
 			rworkload = #{item.rworkload},
 			cusername = #{item.cusername},
-			project_id = #{item.projectId}
+			project_id = #{item.projectId},
+			sworkload = #{item.sworkload}
 	</sql>
 </mapper>
\ No newline at end of file