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 e8af339e..ebb0275a 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,taskOut,crowd;
+ * 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,othFee,feeRemark;
* 表 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,task_out,crowd;
+ * 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,oth_fee,fee_remark;
* 当前主键(包括多主键):
* id;
*/
@@ -136,6 +136,12 @@ public class XmTaskSbillDetail implements java.io.Serializable {
@ApiModelProperty(notes="是否众包",allowEmptyValue=true,example="",allowableValues="")
String crowd;
+
+ @ApiModelProperty(notes="其它费用",allowEmptyValue=true,example="",allowableValues="")
+ BigDecimal othFee;
+
+ @ApiModelProperty(notes="费用说明",allowEmptyValue=true,example="",allowableValues="")
+ String feeRemark;
/**主键**/
public XmTaskSbillDetail(String id) {
@@ -380,6 +386,18 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public void setCrowd(String crowd) {
this.crowd = crowd;
}
+ /**
+ * 其它费用
+ **/
+ public void setOthFee(BigDecimal othFee) {
+ this.othFee = othFee;
+ }
+ /**
+ * 费用说明
+ **/
+ public void setFeeRemark(String feeRemark) {
+ this.feeRemark = feeRemark;
+ }
/**
* 员工编号
@@ -615,5 +633,17 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public String getCrowd() {
return this.crowd;
}
+ /**
+ * 其它费用
+ **/
+ public BigDecimal getOthFee() {
+ return this.othFee;
+ }
+ /**
+ * 费用说明
+ **/
+ public String getFeeRemark() {
+ return this.feeRemark;
+ }
}
\ 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 bac29a4a..59e93f77 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},#{taskOut},#{crowd}
+ #{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},#{othFee},#{feeRemark}
)
@@ -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,task_out,crowd
+ 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,oth_fee,fee_remark
@@ -195,6 +195,8 @@
and res.share_key = #{shareKey}
and res.task_out = #{taskOut}
and res.crowd = #{crowd}
+ and res.oth_fee = #{othFee}
+ and res.fee_remark = #{feeRemark}
@@ -235,7 +237,9 @@
dist_username = #{distUsername},
share_key = #{shareKey},
task_out = #{taskOut},
- crowd = #{crowd}
+ crowd = #{crowd},
+ oth_fee = #{othFee},
+ fee_remark = #{feeRemark}
userid = #{userid},
@@ -276,6 +280,8 @@
share_key = #{shareKey},
task_out = #{taskOut},
crowd = #{crowd},
+ oth_fee = #{othFee},
+ fee_remark = #{feeRemark},
@@ -316,6 +322,8 @@
dist_username = #{item.distUsername},
share_key = #{item.shareKey},
task_out = #{item.taskOut},
- crowd = #{item.crowd}
+ crowd = #{item.crowd},
+ oth_fee = #{item.othFee},
+ fee_remark = #{item.feeRemark}
\ No newline at end of file