Browse Source

重新生成工时表

master
陈裕财 4 years ago
parent
commit
9b5cd70af4
  1. 34
      xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
  2. 16
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml

34
xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTaskExecuser所有属性名: <br> * 实体 XmTaskExecuser所有属性名: <br>
* createTime,taskId,userid,startTime,endTime,status,remarks,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,projectId,phaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,phaseName,taskName,distUserid,distUsername,execUserBranchId,shareKey;<br>
* createTime,taskId,userid,startTime,endTime,status,remarks,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,projectId,phaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,phaseName,taskName,distUserid,distUsername,execUserBranchId,shareKey,sfeeRate,sfee;<br>
* xm_task_execuser xm_task_execuser的所有字段名: <br> * xm_task_execuser xm_task_execuser的所有字段名: <br>
* create_time,task_id,userid,start_time,end_time,status,remarks,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,dist_userid,dist_username,exec_user_branch_id,share_key;<br>
* create_time,task_id,userid,start_time,end_time,status,remarks,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,dist_userid,dist_username,exec_user_branch_id,share_key,sfee_rate,sfee;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* task_id,userid;<br> * task_id,userid;<br>
*/ */
@ -101,6 +101,12 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
String shareKey; String shareKey;
@ApiModelProperty(notes="服务费率",allowEmptyValue=true,example="",allowableValues="")
Integer sfeeRate;
@ApiModelProperty(notes="众包服务费",allowEmptyValue=true,example="",allowableValues="")
BigDecimal sfee;
/**任务id,执行人id**/ /**任务id,执行人id**/
public XmTaskExecuser(String taskId,String userid) { public XmTaskExecuser(String taskId,String userid) {
this.taskId = taskId; this.taskId = taskId;
@ -273,6 +279,18 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setShareKey(String shareKey) { public void setShareKey(String shareKey) {
this.shareKey = shareKey; this.shareKey = shareKey;
} }
/**
* 服务费率
**/
public void setSfeeRate(Integer sfeeRate) {
this.sfeeRate = sfeeRate;
}
/**
* 众包服务费
**/
public void setSfee(BigDecimal sfee) {
this.sfee = sfee;
}
/** /**
* 创建时间 * 创建时间
@ -436,5 +454,17 @@ public class XmTaskExecuser implements java.io.Serializable {
public String getShareKey() { public String getShareKey() {
return this.shareKey; return this.shareKey;
} }
/**
* 服务费率
**/
public Integer getSfeeRate() {
return this.sfeeRate;
}
/**
* 众包服务费
**/
public BigDecimal getSfee() {
return this.sfee;
}
} }

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

@ -138,7 +138,7 @@
insert into xm_task_execuser( insert into xm_task_execuser(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{createTime},#{taskId},#{userid},#{startTime},#{endTime},#{status},#{remarks},#{createUserid},#{createUsername},#{username},#{matchScore},#{quoteWeekday},#{quoteAmount},#{quoteTime},#{projectId},#{phaseId},#{skillRemark},#{quoteWorkload},#{quoteStartTime},#{quoteEndTime},#{branchId},#{phaseName},#{taskName},#{distUserid},#{distUsername},#{execUserBranchId},#{shareKey}
#{createTime},#{taskId},#{userid},#{startTime},#{endTime},#{status},#{remarks},#{createUserid},#{createUsername},#{username},#{matchScore},#{quoteWeekday},#{quoteAmount},#{quoteTime},#{projectId},#{phaseId},#{skillRemark},#{quoteWorkload},#{quoteStartTime},#{quoteEndTime},#{branchId},#{phaseName},#{taskName},#{distUserid},#{distUsername},#{execUserBranchId},#{shareKey},#{sfeeRate},#{sfee}
) )
</insert> </insert>
@ -213,7 +213,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
create_time,task_id,userid,start_time,end_time,status,remarks,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,dist_userid,dist_username,exec_user_branch_id,share_key
create_time,task_id,userid,start_time,end_time,status,remarks,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,dist_userid,dist_username,exec_user_branch_id,share_key,sfee_rate,sfee
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -245,6 +245,8 @@
<if test="distUsername != null and distUsername != ''"> and res.dist_username = #{distUsername} </if> <if test="distUsername != null and distUsername != ''"> and res.dist_username = #{distUsername} </if>
<if test="execUserBranchId != null and execUserBranchId != ''"> and res.exec_user_branch_id = #{execUserBranchId} </if> <if test="execUserBranchId != null and execUserBranchId != ''"> and res.exec_user_branch_id = #{execUserBranchId} </if>
<if test="shareKey != null and shareKey != ''"> and res.share_key = #{shareKey} </if> <if test="shareKey != null and shareKey != ''"> and res.share_key = #{shareKey} </if>
<if test="sfeeRate != null and sfeeRate != ''"> and res.sfee_rate = #{sfeeRate} </if>
<if test="sfee != null and sfee != ''"> and res.sfee = #{sfee} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -272,7 +274,9 @@
dist_userid = #{distUserid}, dist_userid = #{distUserid},
dist_username = #{distUsername}, dist_username = #{distUsername},
exec_user_branch_id = #{execUserBranchId}, exec_user_branch_id = #{execUserBranchId},
share_key = #{shareKey}
share_key = #{shareKey},
sfee_rate = #{sfeeRate},
sfee = #{sfee}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="createTime != null"> create_time = #{createTime}, </if> <if test="createTime != null"> create_time = #{createTime}, </if>
@ -300,6 +304,8 @@
<if test="distUsername != null and distUsername != ''"> dist_username = #{distUsername}, </if> <if test="distUsername != null and distUsername != ''"> dist_username = #{distUsername}, </if>
<if test="execUserBranchId != null and execUserBranchId != ''"> exec_user_branch_id = #{execUserBranchId}, </if> <if test="execUserBranchId != null and execUserBranchId != ''"> exec_user_branch_id = #{execUserBranchId}, </if>
<if test="shareKey != null and shareKey != ''"> share_key = #{shareKey}, </if> <if test="shareKey != null and shareKey != ''"> share_key = #{shareKey}, </if>
<if test="sfeeRate != null and sfeeRate != ''"> sfee_rate = #{sfeeRate}, </if>
<if test="sfee != null and sfee != ''"> sfee = #{sfee}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -327,6 +333,8 @@
dist_userid = #{item.distUserid}, dist_userid = #{item.distUserid},
dist_username = #{item.distUsername}, dist_username = #{item.distUsername},
exec_user_branch_id = #{item.execUserBranchId}, exec_user_branch_id = #{item.execUserBranchId},
share_key = #{item.shareKey}
share_key = #{item.shareKey},
sfee_rate = #{item.sfeeRate},
sfee = #{item.sfee}
</sql> </sql>
</mapper> </mapper>
Loading…
Cancel
Save