From e7497f173cb89b5e33a0479a70628dc9dfccd641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 25 Apr 2022 03:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/entity/XmTaskSbillDetail.java | 19 +++++++++++++++++-- .../xm/core/dao/XmTaskSbillDetailMapper.xml | 12 ++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) 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 ebb0275a..fc9d11d7 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;
+ * 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;
* 表 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;
+ * 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;
* 当前主键(包括多主键):
* id;
*/ @@ -142,6 +142,9 @@ public class XmTaskSbillDetail implements java.io.Serializable { @ApiModelProperty(notes="费用说明",allowEmptyValue=true,example="",allowableValues="") String feeRemark; + + @ApiModelProperty(notes="该任务在本次结算前已结算的金额",allowEmptyValue=true,example="",allowableValues="") + BigDecimal tactAt; /**主键**/ public XmTaskSbillDetail(String id) { @@ -398,6 +401,12 @@ public class XmTaskSbillDetail implements java.io.Serializable { public void setFeeRemark(String feeRemark) { this.feeRemark = feeRemark; } + /** + * 该任务在本次结算前已结算的金额 + **/ + public void setTactAt(BigDecimal tactAt) { + this.tactAt = tactAt; + } /** * 员工编号 @@ -645,5 +654,11 @@ public class XmTaskSbillDetail implements java.io.Serializable { public String getFeeRemark() { return this.feeRemark; } + /** + * 该任务在本次结算前已结算的金额 + **/ + public BigDecimal getTactAt() { + return this.tactAt; + } } \ 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 59e93f77..253efefa 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},#{othFee},#{feeRemark} + #{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} ) @@ -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,oth_fee,fee_remark + 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 @@ -197,6 +197,7 @@ and res.crowd = #{crowd} and res.oth_fee = #{othFee} and res.fee_remark = #{feeRemark} + and res.tact_at = #{tactAt} @@ -239,7 +240,8 @@ task_out = #{taskOut}, crowd = #{crowd}, oth_fee = #{othFee}, - fee_remark = #{feeRemark} + fee_remark = #{feeRemark}, + tact_at = #{tactAt} userid = #{userid}, @@ -282,6 +284,7 @@ crowd = #{crowd}, oth_fee = #{othFee}, fee_remark = #{feeRemark}, + tact_at = #{tactAt}, @@ -324,6 +327,7 @@ task_out = #{item.taskOut}, crowd = #{item.crowd}, oth_fee = #{item.othFee}, - fee_remark = #{item.feeRemark} + fee_remark = #{item.feeRemark}, + tact_at = #{item.tactAt} \ No newline at end of file