Browse Source

task_order

master
陈裕财 4 years ago
parent
commit
19ee6d8076
  1. 7
      xm-core/src/main/java/com/xm/core/entity/XmTask.java
  2. 7
      xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java
  3. 12
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
  4. 12
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskOrderMapper.xml

7
xm-core/src/main/java/com/xm/core/entity/XmTask.java
File diff suppressed because it is too large
View File

7
xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTaskOrder所有属性名: <br> * 实体 XmTaskOrder所有属性名: <br>
* "ouserid","下单用户编号","obranchId","公司ID-下单客户对应的企业","ostatus","订单状态0-初始,1-待确认,2-待付款,3-已付款,4-已完成,5-已取消-未付款前可取消,取消后可删除,6-退单-退单后变为已取消,8已关闭-售后完成后可以关闭订单","ctime","创建时间","ltime","更新时间","payType","支付方式","payStatus","支付状态0待付款,1已付款","payTime","支付时间","prepayId","第三方支付订单编号","id","订单编号","finalFee","最终总费用=origin_fee","othFee","其它费用","originFee","原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee","payAt","最终付款金额-客户付款后回填","payAuthId","支付授权码","payOpenid","支付账户对应的第三方openid,注意,下单根付款不一定是同一个人","payUserid","付款用户编号","payUsername","付款用户名称","discount","折扣率0-199","topFee","置顶费用","topStime","置顶开始时间","topEtime","置顶结束时间","hotFee","热搜费用","hotStime","热搜开始时间","hotEtime","热搜结束时间","top","是否置顶0否1待付款2已开通3已过期","hot","是否热搜0否1待付款2已开通3已过期","crmSupFee","客服包办费用","urgentFee","加急费用","urgent","是否加急0否1待付款2已开通3已过期","crmSup","是否客服包办0否1待付款2已开通3已过期","efunds","托管金额","estate","资金托管状况0-无须托管,1-待付款,2-已托管资金,3-已付款给服务商,4-已退款","etoPlatTime","托管资金付款给平台的时间","etoDevTime","托管资金支付给服务商的时间","ebackTime","托管资金退回甲方时间","taskId","任务编号","topDays","置顶天数","hotDays","热搜天数","urgentDays","加急天数","urgentStime","加急开始时间","urgentEtime","加急结束时间","calcStatus","定时检查日期是否已过期,已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算,1-本周期已计算待下周期计算,2-结束","calcTime","计算时间","oshare","是否开启分享赚0否1待付款2已开通3已过期","shareFee","分享赚佣金","payId","付款流水号(内部生成,传给第三方原样传回,如果不正确,不允许更新数据库,防止作弊)","tranId","第三方付款事务号","remark","订单备注","name","订单名称";<br>
* "ouserid","下单用户编号","obranchId","公司ID-下单客户对应的企业","ostatus","订单状态0-初始,1-待确认,2-待付款,3-已付款,4-已完成,5-已取消-未付款前可取消,取消后可删除,6-退单-退单后变为已取消,8已关闭-售后完成后可以关闭订单","ctime","创建时间","ltime","更新时间","payType","支付方式1微信2支付宝","payStatus","支付状态0待付款,1已付款","payTime","支付时间","prepayId","第三方支付订单编号","id","订单编号","finalFee","最终总费用=origin_fee","othFee","其它费用","originFee","原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee","payAt","最终付款金额-客户付款后回填","payAuthId","支付授权码","payOpenid","支付账户对应的第三方openid,注意,下单根付款不一定是同一个人","payUserid","付款用户编号","payUsername","付款用户名称","discount","折扣率0-199","topFee","置顶费用","topStime","置顶开始时间","topEtime","置顶结束时间","hotFee","热搜费用","hotStime","热搜开始时间","hotEtime","热搜结束时间","top","是否置顶0否1待付款2已开通3已过期","hot","是否热搜0否1待付款2已开通3已过期","crmSupFee","客服包办费用","urgentFee","加急费用","urgent","是否加急0否1待付款2已开通3已过期","crmSup","是否客服包办0否1待付款2已开通3已过期","efunds","托管金额","estate","资金托管状况0-无须托管,1-待付款,2-已托管资金,3-已付款给服务商,4-已退款","etoPlatTime","托管资金付款给平台的时间","etoDevTime","托管资金支付给服务商的时间","ebackTime","托管资金退回甲方时间","taskId","任务编号","topDays","置顶天数","hotDays","热搜天数","urgentDays","加急天数","urgentStime","加急开始时间","urgentEtime","加急结束时间","calcStatus","定时检查日期是否已过期,已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算,1-本周期已计算待下周期计算,2-结束","calcTime","计算时间","oshare","是否开启分享赚0否1待付款2已开通3已过期","shareFee","分享赚佣金","payId","付款流水号(内部生成,传给第三方原样传回,如果不正确,不允许更新数据库,防止作弊)","tranId","第三方付款事务号","remark","订单备注","name","订单名称","bizType","订单业务类型1-保证金,2-营销推广活动";<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -38,7 +38,7 @@ public class XmTaskOrder implements java.io.Serializable {
@ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="")
Date ltime; Date ltime;
@ApiModelProperty(notes="支付方式",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="支付方式1微信2支付宝",allowEmptyValue=true,example="",allowableValues="")
String payType; String payType;
@ApiModelProperty(notes="支付状态0待付款,1已付款",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="支付状态0待付款,1已付款",allowEmptyValue=true,example="",allowableValues="")
@ -169,6 +169,9 @@ public class XmTaskOrder implements java.io.Serializable {
@ApiModelProperty(notes="订单名称",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="订单名称",allowEmptyValue=true,example="",allowableValues="")
String name; String name;
@ApiModelProperty(notes="订单业务类型1-保证金,2-营销推广活动",allowEmptyValue=true,example="",allowableValues="")
String bizType;
/** /**
*订单编号 *订单编号

12
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@ -416,7 +416,7 @@
insert into xm_task( insert into xm_task(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetAt},#{budgetWorkload},#{actAt},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{phaseId},#{phaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl},#{initWorkload},#{shareFee},#{oshare},#{crowd},#{browseUsers},#{execUsers},#{cityId},#{cityName},#{regionType},#{browseTimes},#{capaLvls},#{tranMode},#{supRequires},#{hot},#{top},#{urgent},#{crmSup},#{bidStep},#{interestLvls},#{filePaths},#{estate},#{efunds},#{etoPlatTime},#{etoDevTime},#{ebackTime},#{topStime},#{topEtime},#{hotStime},#{hotEtime},#{urgentStime},#{urgentEtime}
#{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetAt},#{budgetWorkload},#{actAt},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{phaseId},#{phaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime},#{pidPaths},#{lvl},#{isTpl},#{keyPath},#{uniInnerPrice},#{uniOutPrice},#{calcType},#{ptype},#{wtype},#{bctrl},#{initWorkload},#{shareFee},#{oshare},#{crowd},#{browseUsers},#{execUsers},#{cityId},#{cityName},#{regionType},#{browseTimes},#{capaLvls},#{tranMode},#{supRequires},#{hot},#{top},#{urgent},#{crmSup},#{bidStep},#{interestLvls},#{filePaths},#{estate},#{efunds},#{etoPlatTime},#{etoDevTime},#{ebackTime},#{topStime},#{topEtime},#{hotStime},#{hotEtime},#{urgentStime},#{urgentEtime},#{quoteFinalAt}
) )
</insert> </insert>
@ -491,7 +491,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_at,budget_workload,act_at,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,init_workload,share_fee,oshare,crowd,browse_users,exec_users,city_id,city_name,region_type,browse_times,capa_lvls,tran_mode,sup_requires,hot,top,urgent,crm_sup,bid_step,interest_lvls,file_paths,estate,efunds,eto_plat_time,eto_dev_time,eback_time,top_stime,top_etime,hot_stime,hot_etime,urgent_stime,urgent_etime
id,name,parent_taskid,parent_taskname,project_id,project_name,level,sort_level,executor_userid,executor_username,pre_taskid,pre_taskname,start_time,end_time,milestone,description,remarks,create_userid,create_username,create_time,rate,budget_at,budget_workload,act_at,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,phase_id,phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime,pid_paths,lvl,is_tpl,key_path,uni_inner_price,uni_out_price,calc_type,ptype,wtype,bctrl,init_workload,share_fee,oshare,crowd,browse_users,exec_users,city_id,city_name,region_type,browse_times,capa_lvls,tran_mode,sup_requires,hot,top,urgent,crm_sup,bid_step,interest_lvls,file_paths,estate,efunds,eto_plat_time,eto_dev_time,eback_time,top_stime,top_etime,hot_stime,hot_etime,urgent_stime,urgent_etime,quote_final_at
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -589,6 +589,7 @@
<if test="hotEtime != null"> and date_format(res.hot_etime,'%Y-%m-%d') = date_format(#{hotEtime},'%Y-%m-%d') </if> <if test="hotEtime != null"> and date_format(res.hot_etime,'%Y-%m-%d') = date_format(#{hotEtime},'%Y-%m-%d') </if>
<if test="urgentStime != null"> and date_format(res.urgent_stime,'%Y-%m-%d') = date_format(#{urgentStime},'%Y-%m-%d') </if> <if test="urgentStime != null"> and date_format(res.urgent_stime,'%Y-%m-%d') = date_format(#{urgentStime},'%Y-%m-%d') </if>
<if test="urgentEtime != null"> and date_format(res.urgent_etime,'%Y-%m-%d') = date_format(#{urgentEtime},'%Y-%m-%d') </if> <if test="urgentEtime != null"> and date_format(res.urgent_etime,'%Y-%m-%d') = date_format(#{urgentEtime},'%Y-%m-%d') </if>
<if test="quoteFinalAt != null and quoteFinalAt != ''"> and res.quote_final_at = #{quoteFinalAt} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -683,7 +684,8 @@
hot_stime = #{hotStime}, hot_stime = #{hotStime},
hot_etime = #{hotEtime}, hot_etime = #{hotEtime},
urgent_stime = #{urgentStime}, urgent_stime = #{urgentStime},
urgent_etime = #{urgentEtime}
urgent_etime = #{urgentEtime},
quote_final_at = #{quoteFinalAt}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="name != null and name != ''"> name = #{name}, </if> <if test="name != null and name != ''"> name = #{name}, </if>
@ -778,6 +780,7 @@
<if test="hotEtime != null"> hot_etime = #{hotEtime}, </if> <if test="hotEtime != null"> hot_etime = #{hotEtime}, </if>
<if test="urgentStime != null"> urgent_stime = #{urgentStime}, </if> <if test="urgentStime != null"> urgent_stime = #{urgentStime}, </if>
<if test="urgentEtime != null"> urgent_etime = #{urgentEtime}, </if> <if test="urgentEtime != null"> urgent_etime = #{urgentEtime}, </if>
<if test="quoteFinalAt != null and quoteFinalAt != ''"> quote_final_at = #{quoteFinalAt}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -872,6 +875,7 @@
hot_stime = #{item.hotStime}, hot_stime = #{item.hotStime},
hot_etime = #{item.hotEtime}, hot_etime = #{item.hotEtime},
urgent_stime = #{item.urgentStime}, urgent_stime = #{item.urgentStime},
urgent_etime = #{item.urgentEtime}
urgent_etime = #{item.urgentEtime},
quote_final_at = #{item.quoteFinalAt}
</sql> </sql>
</mapper> </mapper>

12
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskOrderMapper.xml

@ -67,7 +67,7 @@
insert into xm_task_order( insert into xm_task_order(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{ouserid},#{obranchId},#{ostatus},#{ctime},#{ltime},#{payType},#{payStatus},#{payTime},#{prepayId},#{id},#{finalFee},#{othFee},#{originFee},#{payAt},#{payAuthId},#{payOpenid},#{payUserid},#{payUsername},#{discount},#{topFee},#{topStime},#{topEtime},#{hotFee},#{hotStime},#{hotEtime},#{top},#{hot},#{crmSupFee},#{urgentFee},#{urgent},#{crmSup},#{efunds},#{estate},#{etoPlatTime},#{etoDevTime},#{ebackTime},#{taskId},#{topDays},#{hotDays},#{urgentDays},#{urgentStime},#{urgentEtime},#{calcStatus},#{calcTime},#{oshare},#{shareFee},#{payId},#{tranId},#{remark},#{name}
#{ouserid},#{obranchId},#{ostatus},#{ctime},#{ltime},#{payType},#{payStatus},#{payTime},#{prepayId},#{id},#{finalFee},#{othFee},#{originFee},#{payAt},#{payAuthId},#{payOpenid},#{payUserid},#{payUsername},#{discount},#{topFee},#{topStime},#{topEtime},#{hotFee},#{hotStime},#{hotEtime},#{top},#{hot},#{crmSupFee},#{urgentFee},#{urgent},#{crmSup},#{efunds},#{estate},#{etoPlatTime},#{etoDevTime},#{ebackTime},#{taskId},#{topDays},#{hotDays},#{urgentDays},#{urgentStime},#{urgentEtime},#{calcStatus},#{calcTime},#{oshare},#{shareFee},#{payId},#{tranId},#{remark},#{name},#{bizType}
) )
</insert> </insert>
@ -142,7 +142,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
ouserid,obranch_id,ostatus,ctime,ltime,pay_type,pay_status,pay_time,prepay_id,id,final_fee,oth_fee,origin_fee,pay_at,pay_auth_id,pay_openid,pay_userid,pay_username,discount,top_fee,top_stime,top_etime,hot_fee,hot_stime,hot_etime,top,hot,crm_sup_fee,urgent_fee,urgent,crm_sup,efunds,estate,eto_plat_time,eto_dev_time,eback_time,task_id,top_days,hot_days,urgent_days,urgent_stime,urgent_etime,calc_status,calc_time,oshare,share_fee,pay_id,tran_id,remark,name
ouserid,obranch_id,ostatus,ctime,ltime,pay_type,pay_status,pay_time,prepay_id,id,final_fee,oth_fee,origin_fee,pay_at,pay_auth_id,pay_openid,pay_userid,pay_username,discount,top_fee,top_stime,top_etime,hot_fee,hot_stime,hot_etime,top,hot,crm_sup_fee,urgent_fee,urgent,crm_sup,efunds,estate,eto_plat_time,eto_dev_time,eback_time,task_id,top_days,hot_days,urgent_days,urgent_stime,urgent_etime,calc_status,calc_time,oshare,share_fee,pay_id,tran_id,remark,name,biz_type
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -197,6 +197,7 @@
<if test="tranId != null and tranId != ''"> and res.tran_id = #{tranId} </if> <if test="tranId != null and tranId != ''"> and res.tran_id = #{tranId} </if>
<if test="remark != null and remark != ''"> and res.remark = #{remark} </if> <if test="remark != null and remark != ''"> and res.remark = #{remark} </if>
<if test="name != null and name != ''"> and res.name = #{name} </if> <if test="name != null and name != ''"> and res.name = #{name} </if>
<if test="bizType != null and bizType != ''"> and res.biz_type = #{bizType} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -248,7 +249,8 @@
pay_id = #{payId}, pay_id = #{payId},
tran_id = #{tranId}, tran_id = #{tranId},
remark = #{remark}, remark = #{remark},
name = #{name}
name = #{name},
biz_type = #{bizType}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="ouserid != null and ouserid != ''"> ouserid = #{ouserid}, </if> <if test="ouserid != null and ouserid != ''"> ouserid = #{ouserid}, </if>
@ -300,6 +302,7 @@
<if test="tranId != null and tranId != ''"> tran_id = #{tranId}, </if> <if test="tranId != null and tranId != ''"> tran_id = #{tranId}, </if>
<if test="remark != null and remark != ''"> remark = #{remark}, </if> <if test="remark != null and remark != ''"> remark = #{remark}, </if>
<if test="name != null and name != ''"> name = #{name}, </if> <if test="name != null and name != ''"> name = #{name}, </if>
<if test="bizType != null and bizType != ''"> biz_type = #{bizType}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -351,6 +354,7 @@
pay_id = #{item.payId}, pay_id = #{item.payId},
tran_id = #{item.tranId}, tran_id = #{item.tranId},
remark = #{item.remark}, remark = #{item.remark},
name = #{item.name}
name = #{item.name},
biz_type = #{item.bizType}
</sql> </sql>
</mapper> </mapper>
Loading…
Cancel
Save