diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java
index 9fb2944a..3f9cbf9b 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java
@@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTaskSbillDetail所有属性名:
- * userid,username,ctime,taskId,bizDate,remark,id,sbillId,stime,sstatus,amt,samt,workload,projectId,sworkload,bizMonth,budgetAt,budgetWorkload,initWorkload,quoteAt,quoteWorkload,sschemel,uniPrice,qendTime,qstartTime,actEndTime,actStartTime,oshare,shareFee,sfee,sfeeRate,cpId,cpName,cpType;
+ * userid,username,ctime,taskId,bizDate,remark,id,sbillId,stime,sstatus,amt,samt,workload,projectId,sworkload,bizMonth,budgetAt,budgetWorkload,initWorkload,quoteAt,quoteWorkload,sschemel,uniPrice,qendTime,qstartTime,actEndTime,actStartTime,oshare,shareFee,sfee,sfeeRate,cpId,cpName,cpType,distUserid,distUsername,shareKey;
* 表 xm_task_sbill_detail 工时登记表的所有字段名:
- * userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee,sfee,sfee_rate,cp_id,cp_name,cp_type;
+ * userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee,sfee,sfee_rate,cp_id,cp_name,cp_type,dist_userid,dist_username,share_key;
* 当前主键(包括多主键):
* id;
*/
@@ -121,6 +121,15 @@ public class XmTaskSbillDetail implements java.io.Serializable {
@ApiModelProperty(notes="相对方类型1-个人，2-企业",allowEmptyValue=true,example="",allowableValues="")
String cpType;
+
+ @ApiModelProperty(notes="推荐人编号",allowEmptyValue=true,example="",allowableValues="")
+ String distUserid;
+
+ @ApiModelProperty(notes="推荐人姓名",allowEmptyValue=true,example="",allowableValues="")
+ String distUsername;
+
+ @ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
+ String shareKey;
/**主键**/
public XmTaskSbillDetail(String id) {
@@ -335,6 +344,24 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public void setCpType(String cpType) {
this.cpType = cpType;
}
+ /**
+ * 推荐人编号
+ **/
+ public void setDistUserid(String distUserid) {
+ this.distUserid = distUserid;
+ }
+ /**
+ * 推荐人姓名
+ **/
+ public void setDistUsername(String distUsername) {
+ this.distUsername = distUsername;
+ }
+ /**
+ * 分享码
+ **/
+ public void setShareKey(String shareKey) {
+ this.shareKey = shareKey;
+ }
/**
* 员工编号
@@ -540,5 +567,23 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public String getCpType() {
return this.cpType;
}
+ /**
+ * 推荐人编号
+ **/
+ public String getDistUserid() {
+ return this.distUserid;
+ }
+ /**
+ * 推荐人姓名
+ **/
+ public String getDistUsername() {
+ return this.distUsername;
+ }
+ /**
+ * 分享码
+ **/
+ public String getShareKey() {
+ return this.shareKey;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml
index 5b573c3f..a825be48 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml
@@ -76,7 +76,7 @@
insert into xm_task_sbill_detail(
) values (
- #{userid},#{username},#{ctime},#{taskId},#{bizDate},#{remark},#{id},#{sbillId},#{stime},#{sstatus},#{amt},#{samt},#{workload},#{projectId},#{sworkload},#{bizMonth},#{budgetAt},#{budgetWorkload},#{initWorkload},#{quoteAt},#{quoteWorkload},#{sschemel},#{uniPrice},#{qendTime},#{qstartTime},#{actEndTime},#{actStartTime},#{oshare},#{shareFee},#{sfee},#{sfeeRate},#{cpId},#{cpName},#{cpType}
+ #{userid},#{username},#{ctime},#{taskId},#{bizDate},#{remark},#{id},#{sbillId},#{stime},#{sstatus},#{amt},#{samt},#{workload},#{projectId},#{sworkload},#{bizMonth},#{budgetAt},#{budgetWorkload},#{initWorkload},#{quoteAt},#{quoteWorkload},#{sschemel},#{uniPrice},#{qendTime},#{qstartTime},#{actEndTime},#{actStartTime},#{oshare},#{shareFee},#{sfee},#{sfeeRate},#{cpId},#{cpName},#{cpType},#{distUserid},#{distUsername},#{shareKey}
)
@@ -151,7 +151,7 @@
- userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee,sfee,sfee_rate,cp_id,cp_name,cp_type
+ userid,username,ctime,task_id,biz_date,remark,id,sbill_id,stime,sstatus,amt,samt,workload,project_id,sworkload,biz_month,budget_at,budget_workload,init_workload,quote_at,quote_workload,sschemel,uni_price,qend_time,qstart_time,act_end_time,act_start_time,oshare,share_fee,sfee,sfee_rate,cp_id,cp_name,cp_type,dist_userid,dist_username,share_key
@@ -190,6 +190,9 @@
and res.cp_id = #{cpId}
and res.cp_name = #{cpName}
and res.cp_type = #{cpType}
+ and res.dist_userid = #{distUserid}
+ and res.dist_username = #{distUsername}
+ and res.share_key = #{shareKey}
@@ -225,7 +228,10 @@
sfee_rate = #{sfeeRate},
cp_id = #{cpId},
cp_name = #{cpName},
- cp_type = #{cpType}
+ cp_type = #{cpType},
+ dist_userid = #{distUserid},
+ dist_username = #{distUsername},
+ share_key = #{shareKey}
userid = #{userid},
@@ -261,6 +267,9 @@
cp_id = #{cpId},
cp_name = #{cpName},
cp_type = #{cpType},
+ dist_userid = #{distUserid},
+ dist_username = #{distUsername},
+ share_key = #{shareKey},
@@ -296,6 +305,9 @@
sfee_rate = #{item.sfeeRate},
cp_id = #{item.cpId},
cp_name = #{item.cpName},
- cp_type = #{item.cpType}
+ cp_type = #{item.cpType},
+ dist_userid = #{item.distUserid},
+ dist_username = #{item.distUsername},
+ share_key = #{item.shareKey}
\ 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 55164c96..d8b235e2 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
@@ -138,8 +138,8 @@