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 6e2aaa2d..3eac248b 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,othFee,feeRemark,tactAt,taskName;
+ * 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,tactAt,taskName,subjectId,subjectName,branchId;
* 表 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,oth_fee,fee_remark,tact_at,task_name;
+ * 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,tact_at,task_name,subject_id,subject_name,branch_id;
* 当前主键(包括多主键):
* id;
*/
@@ -148,6 +148,15 @@ public class XmTaskSbillDetail implements java.io.Serializable {
@ApiModelProperty(notes="任务名称",allowEmptyValue=true,example="",allowableValues="")
String taskName;
+
+ @ApiModelProperty(notes="费用科目编号",allowEmptyValue=true,example="",allowableValues="")
+ String subjectId;
+
+ @ApiModelProperty(notes="费用科目名称",allowEmptyValue=true,example="",allowableValues="")
+ String subjectName;
+
+ @ApiModelProperty(notes="项目归属机构号",allowEmptyValue=true,example="",allowableValues="")
+ String branchId;
/**主键**/
public XmTaskSbillDetail(String id) {
@@ -416,6 +425,24 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public void setTaskName(String taskName) {
this.taskName = taskName;
}
+ /**
+ * 费用科目编号
+ **/
+ public void setSubjectId(String subjectId) {
+ this.subjectId = subjectId;
+ }
+ /**
+ * 费用科目名称
+ **/
+ public void setSubjectName(String subjectName) {
+ this.subjectName = subjectName;
+ }
+ /**
+ * 项目归属机构号
+ **/
+ public void setBranchId(String branchId) {
+ this.branchId = branchId;
+ }
/**
* 员工编号
@@ -675,5 +702,23 @@ public class XmTaskSbillDetail implements java.io.Serializable {
public String getTaskName() {
return this.taskName;
}
+ /**
+ * 费用科目编号
+ **/
+ public String getSubjectId() {
+ return this.subjectId;
+ }
+ /**
+ * 费用科目名称
+ **/
+ public String getSubjectName() {
+ return this.subjectName;
+ }
+ /**
+ * 项目归属机构号
+ **/
+ public String getBranchId() {
+ return this.branchId;
+ }
}
\ 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 7399b939..a0bbe787 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
@@ -104,7 +104,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},#{othFee},#{feeRemark},#{tactAt},#{taskName}
+ #{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},#{tactAt},#{taskName},#{subjectId},#{subjectName},#{branchId}
)
@@ -179,7 +179,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,oth_fee,fee_remark,tact_at,task_name
+ 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,tact_at,task_name,subject_id,subject_name,branch_id
@@ -227,6 +227,9 @@
and res.fee_remark = #{feeRemark}
and res.tact_at = #{tactAt}
and res.task_name = #{taskName}
+ and res.subject_id = #{subjectId}
+ and res.subject_name = #{subjectName}
+ and res.branch_id = #{branchId}
@@ -271,7 +274,10 @@
oth_fee = #{othFee},
fee_remark = #{feeRemark},
tact_at = #{tactAt},
- task_name = #{taskName}
+ task_name = #{taskName},
+ subject_id = #{subjectId},
+ subject_name = #{subjectName},
+ branch_id = #{branchId}
userid = #{userid},
@@ -316,6 +322,9 @@
fee_remark = #{feeRemark},
tact_at = #{tactAt},
task_name = #{taskName},
+ subject_id = #{subjectId},
+ subject_name = #{subjectName},
+ branch_id = #{branchId},
@@ -360,6 +369,9 @@
oth_fee = #{item.othFee},
fee_remark = #{item.feeRemark},
tact_at = #{item.tactAt},
- task_name = #{item.taskName}
+ task_name = #{item.taskName},
+ subject_id = #{item.subjectId},
+ subject_name = #{item.subjectName},
+ branch_id = #{item.branchId}
\ No newline at end of file