Browse Source

重新生成工时表

master
陈裕财 4 years ago
parent
commit
c391d416c7
  1. 34
      xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java
  2. 16
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml

34
xm-core/src/main/java/com/xm/core/entity/XmTaskSbillDetail.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTaskSbillDetail所有属性名: <br>
* 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;<br>
* 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;<br>
* xm_task_sbill_detail 工时登记表的所有字段名: <br>
* 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;<br>
* 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;<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -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;
}
}

16
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml

@ -76,7 +76,7 @@
insert into xm_task_sbill_detail(
<include refid="columns"/>
) 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}
)
</insert>
@ -151,7 +151,7 @@
<!--sql片段 列-->
<sql id="columns">
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
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -195,6 +195,8 @@
<if test="shareKey != null and shareKey != ''"> and res.share_key = #{shareKey} </if>
<if test="taskOut != null and taskOut != ''"> and res.task_out = #{taskOut} </if>
<if test="crowd != null and crowd != ''"> and res.crowd = #{crowd} </if>
<if test="othFee != null and othFee != ''"> and res.oth_fee = #{othFee} </if>
<if test="feeRemark != null and feeRemark != ''"> and res.fee_remark = #{feeRemark} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -235,7 +237,9 @@
dist_username = #{distUsername},
share_key = #{shareKey},
task_out = #{taskOut},
crowd = #{crowd}
crowd = #{crowd},
oth_fee = #{othFee},
fee_remark = #{feeRemark}
</sql>
<sql id="someFieldSet">
<if test="userid != null and userid != ''"> userid = #{userid}, </if>
@ -276,6 +280,8 @@
<if test="shareKey != null and shareKey != ''"> share_key = #{shareKey}, </if>
<if test="taskOut != null and taskOut != ''"> task_out = #{taskOut}, </if>
<if test="crowd != null and crowd != ''"> crowd = #{crowd}, </if>
<if test="othFee != null and othFee != ''"> oth_fee = #{othFee}, </if>
<if test="feeRemark != null and feeRemark != ''"> fee_remark = #{feeRemark}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -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}
</sql>
</mapper>
Loading…
Cancel
Save