From 4927532d760d5067b24a7545e3db094ec435b0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 29 Mar 2022 18:10:28 +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

---
 .../core/ctrl/XmTaskWorkloadController.java   |  1 +
 .../com/xm/core/entity/XmTaskWorkload.java    | 51 +++++++++++++++++--
 .../xm/core/dao/XmTaskWorkloadMapper.xml      | 20 ++++++--
 3 files changed, 65 insertions(+), 7 deletions(-)

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 f0cda5d3..a0cd2996 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
@@ -136,6 +136,7 @@ public class XmTaskWorkloadController {
 				xmTaskWorkload.setUserid(user.getUserid());
 				xmTaskWorkload.setUsername(user.getUsername());
 			}
+
 			xmTaskWorkload.setWstatus("0");
 			xmTaskWorkloadService.insert(xmTaskWorkload);
 			m.put("data",xmTaskWorkload);
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 1b03ca0b..f0ddc6b8 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
@@ -1,4 +1,4 @@
-package com.xm.core.entity;
+package  com.xm.core.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -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;<br>
+ *	userid,username,ctime,taskId,cuserid,bizDate,wstatus,remark,ttype,id,sbillId,stime,sstatus,amt,samt,workload,rworkload,cusername,projectId;<br>
  * 表 xm_task_workload 工时登记表的所有字段名: <br>
- *	userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,sbill_id,stime,sstatus,amt,samt,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>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -67,6 +67,15 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="工时，一个task_id可多次提交，小时",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal workload;
+	
+	@ApiModelProperty(notes="剩余工时（同一天取最后日期更新到task表rworkload中）",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal rworkload;
+	
+	@ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="")
+	String cusername;
+	
+	@ApiModelProperty(notes="归属项目",allowEmptyValue=true,example="",allowableValues="")
+	String projectId;
 
 	/**主键**/
 	public XmTaskWorkload(String id) {
@@ -173,6 +182,24 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	public void setWorkload(BigDecimal workload) {
 		this.workload = workload;
 	}
+	/**
+	 * 剩余工时（同一天取最后日期更新到task表rworkload中）
+	 **/
+	public void setRworkload(BigDecimal rworkload) {
+		this.rworkload = rworkload;
+	}
+	/**
+	 * 创建人姓名
+	 **/
+	public void setCusername(String cusername) {
+		this.cusername = cusername;
+	}
+	/**
+	 * 归属项目
+	 **/
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
 	
 	/**
 	 * 员工编号
@@ -270,5 +297,23 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	public BigDecimal getWorkload() {
 		return this.workload;
 	}
+	/**
+	 * 剩余工时（同一天取最后日期更新到task表rworkload中）
+	 **/
+	public BigDecimal getRworkload() {
+		return this.rworkload;
+	}
+	/**
+	 * 创建人姓名
+	 **/
+	public String getCusername() {
+		return this.cusername;
+	}
+	/**
+	 * 归属项目
+	 **/
+	public String getProjectId() {
+		return this.projectId;
+	}
 
 }
\ 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 9c2eb83d..e7241a46 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
@@ -92,7 +92,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}
+		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{sbillId},#{stime},#{sstatus},#{amt},#{samt},#{workload},#{rworkload},#{cusername},#{projectId}
 		)
 	</insert>
 	
@@ -155,7 +155,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,sbill_id,stime,sstatus,amt,samt,workload
+		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,sbill_id,stime,sstatus,amt,samt,workload,rworkload,cusername,project_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -176,6 +176,9 @@
 		<if test="amt != null and amt != ''">      and res.amt = #{amt}     </if>
 		<if test="samt != null and samt != ''">      and res.samt = #{samt}     </if>
 		<if test="workload != null and workload != ''">      and res.workload = #{workload}     </if>
+		<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>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -193,7 +196,10 @@
 		sstatus = #{sstatus},
 		amt = #{amt},
 		samt = #{samt},
-		workload = #{workload}
+		workload = #{workload},
+		rworkload = #{rworkload},
+		cusername = #{cusername},
+		project_id = #{projectId}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="userid != null and userid != ''"> userid = #{userid},     </if>
@@ -211,6 +217,9 @@
 		<if test="amt != null and amt != ''"> amt = #{amt},     </if>
 		<if test="samt != null and samt != ''"> samt = #{samt},     </if>
 		<if test="workload != null and workload != ''"> workload = #{workload},     </if>
+		<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>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -228,6 +237,9 @@
 			sstatus = #{item.sstatus},
 			amt = #{item.amt},
 			samt = #{item.samt},
-			workload = #{item.workload}
+			workload = #{item.workload},
+			rworkload = #{item.rworkload},
+			cusername = #{item.cusername},
+			project_id = #{item.projectId}
 	</sql>
 </mapper>
\ No newline at end of file