重构工时系统

xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskWorkload所有属性名: <br>
- *	"userid","员工编号","username","姓名","ctime","创建日期","taskId","业务对象主键任务编号","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","sbillName","结算单名称","detailId","结算单明细表id";<br>
+ *	"userid","员工编号","username","姓名","ctime","创建日期","taskId","业务对象主键任务编号","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","detailId","结算单明细表id";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -77,9 +77,6 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	@ApiModelProperty(notes="结算单编号",allowEmptyValue=true,example="",allowableValues="")
 	String sbillId;
 	
-	@ApiModelProperty(notes="结算单名称",allowEmptyValue=true,example="",allowableValues="")
-	String sbillName;
-	
 	@ApiModelProperty(notes="结算单明细表id",allowEmptyValue=true,example="",allowableValues="")
 	String detailId;
 

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml

@@ -212,7 +212,7 @@
 	</select>
 	<update id="updateStatusAfterJoinSbill" parameterType="List">
 		<foreach collection="list" item="item" index="index" separator=";" >
-			update xm_task_workload res set res.sstatus='2',res.detail_id=#{item.id},res.sbill_id=#{item.sbillId},res.sbill_name=#{item.sbillName}
+			update xm_task_workload res set res.sstatus='2',res.detail_id=#{item.id},res.sbill_id=#{item.sbillId}
 			where res.sstatus='1' and res.userid=#{item.userid} and res.task_id=#{item.taskId}
 		</foreach>
 	</update>
@@ -284,7 +284,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},#{branchId},#{ubranchId},#{sbillId},#{sbillName},#{detailId}
+		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{branchId},#{ubranchId},#{sbillId},#{detailId}
 		)
 	</insert>
 	
@@ -359,7 +359,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,branch_id,ubranch_id,sbill_id,sbill_name,detail_id
+		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,branch_id,ubranch_id,sbill_id,detail_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -383,7 +383,6 @@
 		<if test="branchId != null and branchId != ''">      and res.branch_id = #{branchId}     </if>
 		<if test="ubranchId != null and ubranchId != ''">      and res.ubranch_id = #{ubranchId}     </if>
 		<if test="sbillId != null and sbillId != ''">      and res.sbill_id = #{sbillId}     </if>
-		<if test="sbillName != null and sbillName != ''">      and res.sbill_name = #{sbillName}     </if>
 		<if test="detailId != null and detailId != ''">      and res.detail_id = #{detailId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
@@ -406,7 +405,6 @@
 		branch_id = #{branchId},
 		ubranch_id = #{ubranchId},
 		sbill_id = #{sbillId},
-		sbill_name = #{sbillName},
 		detail_id = #{detailId}
 	</sql>
 	<sql id="someFieldSet">
@@ -428,7 +426,6 @@
 		<if test="branchId != null and branchId != ''"> branch_id = #{branchId},     </if>
 		<if test="ubranchId != null and ubranchId != ''"> ubranch_id = #{ubranchId},     </if>
 		<if test="sbillId != null and sbillId != ''"> sbill_id = #{sbillId},     </if>
-		<if test="sbillName != null and sbillName != ''"> sbill_name = #{sbillName},     </if>
 		<if test="detailId != null and detailId != ''"> detail_id = #{detailId},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
@@ -451,7 +448,6 @@
 			branch_id = #{item.branchId},
 			ubranch_id = #{item.ubranchId},
 			sbill_id = #{item.sbillId},
-			sbill_name = #{item.sbillName},
 			detail_id = #{item.detailId}
 	</sql>
 </mapper>