diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
index f5db2a41..dd48099d 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTaskExecuser所有属性名:
- * 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;
* 表 xm_task_execuser xm_task_execuser的所有字段名:
- * 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;
* 当前主键(包括多主键):
* task_id,userid;
*/
@@ -100,6 +100,12 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
String shareKey;
+
+ @ApiModelProperty(notes="服务费率",allowEmptyValue=true,example="",allowableValues="")
+ Integer sfeeRate;
+
+ @ApiModelProperty(notes="众包服务费",allowEmptyValue=true,example="",allowableValues="")
+ BigDecimal sfee;
/**任务id,执行人id**/
public XmTaskExecuser(String taskId,String userid) {
@@ -273,6 +279,18 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setShareKey(String 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() {
return this.shareKey;
}
+ /**
+ * 服务费率
+ **/
+ public Integer getSfeeRate() {
+ return this.sfeeRate;
+ }
+ /**
+ * 众包服务费
+ **/
+ public BigDecimal getSfee() {
+ return this.sfee;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
index 490f0be0..d1af1141 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
@@ -138,7 +138,7 @@
insert into xm_task_execuser(
) 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}
)
@@ -213,7 +213,7 @@
- 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
@@ -245,6 +245,8 @@
and res.dist_username = #{distUsername}
and res.exec_user_branch_id = #{execUserBranchId}
and res.share_key = #{shareKey}
+ and res.sfee_rate = #{sfeeRate}
+ and res.sfee = #{sfee}
@@ -272,7 +274,9 @@
dist_userid = #{distUserid},
dist_username = #{distUsername},
exec_user_branch_id = #{execUserBranchId},
- share_key = #{shareKey}
+ share_key = #{shareKey},
+ sfee_rate = #{sfeeRate},
+ sfee = #{sfee}
create_time = #{createTime},
@@ -300,6 +304,8 @@
dist_username = #{distUsername},
exec_user_branch_id = #{execUserBranchId},
share_key = #{shareKey},
+ sfee_rate = #{sfeeRate},
+ sfee = #{sfee},
@@ -327,6 +333,8 @@
dist_userid = #{item.distUserid},
dist_username = #{item.distUsername},
exec_user_branch_id = #{item.execUserBranchId},
- share_key = #{item.shareKey}
+ share_key = #{item.shareKey},
+ sfee_rate = #{item.sfeeRate},
+ sfee = #{item.sfee}
\ No newline at end of file