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 小模块
* 实体 XmTaskWorkload所有属性名:
- * 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;
* 表 xm_task_workload 工时登记表的所有字段名:
- * 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;
* 当前主键(包括多主键):
* id;
*/
@@ -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(
) 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}
)
@@ -338,7 +338,7 @@
- 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
@@ -360,6 +360,8 @@
and res.cusername = #{cusername}
and res.project_id = #{projectId}
and res.detail_id = #{detailId}
+ and res.branch_id = #{branchId}
+ and res.ubranch_id = #{ubranchId}
@@ -378,7 +380,9 @@
rworkload = #{rworkload},
cusername = #{cusername},
project_id = #{projectId},
- detail_id = #{detailId}
+ detail_id = #{detailId},
+ branch_id = #{branchId},
+ ubranch_id = #{ubranchId}
userid = #{userid},
@@ -397,6 +401,8 @@
cusername = #{cusername},
project_id = #{projectId},
detail_id = #{detailId},
+ branch_id = #{branchId},
+ ubranch_id = #{ubranchId},
@@ -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}
\ No newline at end of file