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 3f9cbf9b..e8af339e 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,distUserid,distUsername,shareKey;
+ * 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,taskOut,crowd;
* 表 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,dist_userid,dist_username,share_key;
+ * 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,task_out,crowd;
* 当前主键(包括多主键):
* id;
*/
@@ -130,6 +130,12 @@ public class XmTaskSbillDetail implements java.io.Serializable {
@ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
String shareKey;
+
+ @ApiModelProperty(notes="是否外购0否1是",allowEmptyValue=true,example="",allowableValues="")
+ String taskOut;
+
+ @ApiModelProperty(notes="是否众包",allowEmptyValue=true,example="",allowableValues="")
+ String crowd;
/**主键**/
public XmTaskSbillDetail(String id) {
@@ -362,6 +368,18 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public void setShareKey(String shareKey) {
this.shareKey = shareKey;
}
+ /**
+ * 是否外购0否1是
+ **/
+ public void setTaskOut(String taskOut) {
+ this.taskOut = taskOut;
+ }
+ /**
+ * 是否众包
+ **/
+ public void setCrowd(String crowd) {
+ this.crowd = crowd;
+ }
/**
* 员工编号
@@ -585,5 +603,17 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public String getShareKey() {
return this.shareKey;
}
+ /**
+ * 是否外购0否1是
+ **/
+ public String getTaskOut() {
+ return this.taskOut;
+ }
+ /**
+ * 是否众包
+ **/
+ public String getCrowd() {
+ return this.crowd;
+ }
}
\ 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 a825be48..bac29a4a 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},#{distUserid},#{distUsername},#{shareKey}
+ #{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},#{taskOut},#{crowd}
)
@@ -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,dist_userid,dist_username,share_key
+ 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,task_out,crowd
@@ -193,6 +193,8 @@
and res.dist_userid = #{distUserid}
and res.dist_username = #{distUsername}
and res.share_key = #{shareKey}
+ and res.task_out = #{taskOut}
+ and res.crowd = #{crowd}
@@ -231,7 +233,9 @@
cp_type = #{cpType},
dist_userid = #{distUserid},
dist_username = #{distUsername},
- share_key = #{shareKey}
+ share_key = #{shareKey},
+ task_out = #{taskOut},
+ crowd = #{crowd}
userid = #{userid},
@@ -270,6 +274,8 @@
dist_userid = #{distUserid},
dist_username = #{distUsername},
share_key = #{shareKey},
+ task_out = #{taskOut},
+ crowd = #{crowd},
@@ -308,6 +314,8 @@
cp_type = #{item.cpType},
dist_userid = #{item.distUserid},
dist_username = #{item.distUsername},
- share_key = #{item.shareKey}
+ share_key = #{item.shareKey},
+ task_out = #{item.taskOut},
+ crowd = #{item.crowd}
\ No newline at end of file