From c741c6f70636c570414445ba3bb5bb2ea28de862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 30 Apr 2022 17:15:19 +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

---
 .../com/xm/core/entity/XmTaskWorkload.java    | 34 +++++++++++++++++--
 .../xm/core/dao/XmTaskWorkloadMapper.xml      | 16 ++++++---
 2 files changed, 44 insertions(+), 6 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 7731922b..3d5f34b7 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,stime,sstatus,workload,rworkload,cusername,projectId,detailId;<br>
+ *	userid,username,ctime,taskId,cuserid,bizDate,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,projectId,detailId,branchId,ubranchId;<br>
  * 表 xm_task_workload 工时登记表的所有字段名: <br>
- *	userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,detail_id;<br>
+ *	userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,detail_id,branch_id,ubranch_id;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -70,6 +70,12 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="结算明细编号，指向xm_task_sbill_detail.id",allowEmptyValue=true,example="",allowableValues="")
 	String detailId;
+	
+	@ApiModelProperty(notes="项目归属机构",allowEmptyValue=true,example="",allowableValues="")
+	String branchId;
+	
+	@ApiModelProperty(notes="用户归属机构",allowEmptyValue=true,example="",allowableValues="")
+	String ubranchId;
 
 	/**主键**/
 	public XmTaskWorkload(String id) {
@@ -182,6 +188,18 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	public void setDetailId(String detailId) {
 		this.detailId = detailId;
 	}
+	/**
+	 * 项目归属机构
+	 **/
+	public void setBranchId(String branchId) {
+		this.branchId = branchId;
+	}
+	/**
+	 * 用户归属机构
+	 **/
+	public void setUbranchId(String ubranchId) {
+		this.ubranchId = ubranchId;
+	}
 	
 	/**
 	 * 员工编号
@@ -285,5 +303,17 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	public String getDetailId() {
 		return this.detailId;
 	}
+	/**
+	 * 项目归属机构
+	 **/
+	public String getBranchId() {
+		return this.branchId;
+	}
+	/**
+	 * 用户归属机构
+	 **/
+	public String getUbranchId() {
+		return this.ubranchId;
+	}
 
 }
\ 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 8d957d8c..862407b3 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
@@ -263,7 +263,7 @@
 		insert into xm_task_workload(
 			<include refid="columns"/>
 		) values (
-		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{detailId}
+		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{detailId},#{branchId},#{ubranchId}
 		)
 	</insert>
 	
@@ -338,7 +338,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,detail_id
+		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,detail_id,branch_id,ubranch_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -360,6 +360,8 @@
 		<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="detailId != null and detailId != ''">      and res.detail_id = #{detailId}     </if>
+		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
+		<if test="ubranchId != null and ubranchId != ''">      and res.ubranch_id = #{ubranchId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -378,7 +380,9 @@
 		rworkload = #{rworkload},
 		cusername = #{cusername},
 		project_id = #{projectId},
-		detail_id = #{detailId}
+		detail_id = #{detailId},
+		branch_id = #{branchId},
+		ubranch_id = #{ubranchId}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="userid != null and userid != ''"> userid = #{userid},     </if>
@@ -397,6 +401,8 @@
 		<if test="cusername != null and cusername != ''"> cusername = #{cusername},     </if>
 		<if test="projectId != null and projectId != ''"> project_id = #{projectId},     </if>
 		<if test="detailId != null and detailId != ''"> detail_id = #{detailId},     </if>
+		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
+		<if test="ubranchId != null and ubranchId != ''"> ubranch_id = #{ubranchId},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -415,6 +421,8 @@
 			rworkload = #{item.rworkload},
 			cusername = #{item.cusername},
 			project_id = #{item.projectId},
-			detail_id = #{item.detailId}
+			detail_id = #{item.detailId},
+			branch_id = #{item.branchId},
+			ubranch_id = #{item.ubranchId}
 	</sql>
 </mapper>
\ No newline at end of file