end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

task_order

master
陈裕财 4 years ago
parent
8b2919e7af
commit
113d0270ba
3 changed files with 24 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      xm-core/src/main/java/com/xm/core/entity/XmTask.java
  2. 14
      xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java
  3. 27
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

14
xm-core/src/main/java/com/xm/core/entity/XmTask.java
View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTask所有属性名: <br> * 实体 XmTask所有属性名: <br>
* "id","任务编号","name","任务名称","parentTaskid","父任务编号","parentTaskname","父任务名称","projectId","项目编号","projectName","项目名称","level","任务级别","sortLevel","序号","executorUserid","任务执行人编号","executorUsername","任务执行人","preTaskid","前置任务编号","preTaskname","前置任务名称","startTime","任务开始时间","endTime","任务结束时间","milestone","里程碑","description","任务描述","remarks","备注","createUserid","任务创建人编号（谁创建谁负责）","createUsername","任务创建人（谁创建谁负责）","createTime","创建时间","rate","任务进度0-100（=实际工时/(实际工时+剩余工时)*100）","budgetAt","当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）","budgetWorkload","预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）","actAt","当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额","actWorkload","任务取工时表报工工时汇总，","taskState","任务状态0待领取1已领取执行中2已完工3已结算4已关闭5草稿","taskType","0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType","taskClass","1需结算0不需结算","toTaskCenter","是否发布到任务大厅0否1是,1时互联网可访问","actStartTime","实际开始时间-任务状态变成执行中的时间","actEndTime","实际结束时间-任务状态变成完工状态时的时间","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","phaseId","项目阶段编号(作废)","phaseName","项目阶段名称(作废)","taskSkillNames","技能列表,逗号分隔","exeUsernames","执行人列表逗号分隔如陈x(审核人),王x(监控人)","taskSkillIds","技能编号列表逗号分隔","exeUserids","执行人编号列表逗号分隔如u1(1),u2(2)","taskOut","执行方式-0内研1外购","planType","计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年","settleSchemel","任务结算方案-来自数字字典xmTaskSettleSchemel","menuId","归属功能编号","menuName","归属功能名称","productId","产品编号根据功能变化带进","cbranchId","创建机构","cdeptid","创建部门","tagIds","标签编号，逗号分割","tagNames","标签名称，逗号分割","ntype","节点类型0-任务，1-计划。计划下可建立计划和任务，任务下不允许再扩展。也就是非叶子节点都是计划，叶子节点有可能是计划或者任务","childrenCnt","儿子节点个数","ltime","更新时间","pidPaths","父级id逗号分割，最后一个为本节点节点编号,以,号结尾","lvl","层级0-顶级，1-一级，2-二级，3-三级，4-四级。总共5级","isTpl","是否为模板","keyPath","是否为关键路径上的节点","uniInnerPrice","内部单位工时单价","uniOutPrice","外部单位工时单价","calcType","数据统计方式","ptype","计划分类0-项目，1产品,空为不区分","wtype","报工方式1-强制每日报工，2-工期内报工，0-无需报工","bctrl","报工限制0-不限制，1-不得超出预估工时","initWorkload","原始预估工作量，budget_workload发生变化后，进行备份","shareFee","分享赚佣金","oshare","开启分享赚功能0-否1是","crowd","是否众包0否1是，众包属于外购的一种","browseUsers","浏览人数","execUsers","投标人数","cityId","城市编号","cityName","城市名称","regionType","地域限制方式0-不限制，1-同城，2-同省，3-同国，4-同洲","browseTimes","浏览次数","capaLvls","能力等级最小要求","tranMode","交易模式1-招标，2-雇佣","supRequires","保障要求编号列表，多个逗号分割","hot","是否为热搜0否1是是否为置顶0否1是,每次热搜3天，3天后自动取消热搜","top","是否为置顶0否1是,每次置顶3天，3天后自动取消置顶","urgent","加急0否1是","crmSup","客服包办0否1是，理顺需求、比稿选稿","bidStep","投标流程0-草稿，1-发布需求，2-用户投标，3雇主选标，4拓管赏金，5用户工作，6验收付款,7完结","interestLvls","会员等级最小要求","filePaths","附件地址列表，逗号分割","estate","资金托管状况0-无须托管，1-已托管，2-已付款给服务商，3-已退款","efunds","托管金额","etoPlatTime","托管资金付款给平台的时间","etoDevTime","托管资金支付给服务商的时间","ebackTime","托管资金退回甲方时间","topStime","置顶开始时间","topEtime","置顶结束时间","hotStime","热搜开始时间","hotEtime","热搜结束时间","urgentStime","加急开始时间","urgentEtime","加急结束时间";<br>
* "id","任务编号","name","任务名称","parentTaskid","父任务编号","parentTaskname","父任务名称","projectId","项目编号","projectName","项目名称","level","任务级别","sortLevel","序号","executorUserid","任务执行人编号","executorUsername","任务执行人","preTaskid","前置任务编号","preTaskname","前置任务名称","startTime","任务开始时间","endTime","任务结束时间","milestone","里程碑","description","任务描述","remarks","备注","createUserid","任务创建人编号（谁创建谁负责）","createUsername","任务创建人（谁创建谁负责）","createTime","创建时间","rate","任务进度0-100（=实际工时/(实际工时+剩余工时)*100）","budgetAt","当前任务预算金额（calc_type=2时预算工时*单价，calc_type=1时下级汇总）","budgetWorkload","预算工时（calc_type=2时手工填写，calc_type=1时下级汇总）","actAt","当前任务实际费用金额（calc_type=2时，取实际工时*单价，calc_type=1时取下级汇总数据）待结算金额","actWorkload","任务取工时表报工工时汇总，","taskState","任务状态0待领取1已领取执行中2已完工3已结算4已关闭5草稿","taskType","0售前方案1投标2需求3设计4开发5测试6验收7部署8运维--来自基础数据表taskType","taskClass","1需结算0不需结算","toTaskCenter","是否发布到任务大厅0否1是,1时互联网可访问","actStartTime","实际开始时间-任务状态变成执行中的时间","actEndTime","实际结束时间-任务状态变成完工状态时的时间","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","phaseId","项目阶段编号(作废)","phaseName","项目阶段名称(作废)","taskSkillNames","技能列表,逗号分隔","exeUsernames","执行人列表逗号分隔如陈x(审核人),王x(监控人)","taskSkillIds","技能编号列表逗号分隔","exeUserids","执行人编号列表逗号分隔如u1(1),u2(2)","taskOut","执行方式-0内研1外购","planType","计划类型w1-周,w2-2周,w3-3周,m1-1月,m2-2月,q1-季,q2-半年，y1-年","settleSchemel","任务结算方案-来自数字字典xmTaskSettleSchemel","menuId","归属功能编号","menuName","归属功能名称","productId","产品编号根据功能变化带进","cbranchId","创建机构","cdeptid","创建部门","tagIds","标签编号，逗号分割","tagNames","标签名称，逗号分割","ntype","节点类型0-任务，1-计划。计划下可建立计划和任务，任务下不允许再扩展。也就是非叶子节点都是计划，叶子节点有可能是计划或者任务","childrenCnt","儿子节点个数","ltime","更新时间","pidPaths","父级id逗号分割，最后一个为本节点节点编号,以,号结尾","lvl","层级0-顶级，1-一级，2-二级，3-三级，4-四级。总共5级","isTpl","是否为模板","keyPath","是否为关键路径上的节点","uniInnerPrice","内部单位工时单价","uniOutPrice","外部单位工时单价","calcType","数据统计方式","ptype","计划分类0-项目，1产品,空为不区分","wtype","报工方式1-强制每日报工，2-工期内报工，0-无需报工","bctrl","报工限制0-不限制，1-不得超出预估工时","initWorkload","原始预估工作量，budget_workload发生变化后，进行备份","shareFee","分享赚佣金","oshare","开启分享赚功能0-否1-待付款，2已付款","crowd","是否众包0否1是，众包属于外购的一种","browseUsers","浏览人数","execUsers","投标人数","cityId","城市编号","cityName","城市名称","regionType","地域限制方式0-不限制，1-同城，2-同省，3-同国，4-同洲","browseTimes","浏览次数","capaLvls","能力等级最小要求","tranMode","交易模式1-招标，2-雇佣","supRequires","保障要求编号列表，多个逗号分割","hot","是否为热搜0否1待付款2已开通3已过期,每次热搜3天，3天后自动取消热搜","top","是否为置顶0否1待付款2已开通3已过期,每次置顶3天，3天后自动取消置顶","urgent","加急0否1待付款2已开通3已过期","crmSup","客服包办0否1待付款2已开通，理顺需求、比稿选稿","bidStep","投标流程0-草稿，1-发布需求，2-用户投标，3雇主选标，4拓管赏金，5用户工作，6验收付款,7完结","interestLvls","会员等级最小要求","filePaths","附件地址列表，逗号分割","estate","资金托管状况0-无须托管，1-待付款，2-已托管资金，3-已付款给服务商，4-已退款","efunds","托管金额","etoPlatTime","托管资金付款给平台的时间","etoDevTime","托管资金支付给服务商的时间","ebackTime","托管资金退回甲方时间","topStime","置顶开始时间","topEtime","置顶结束时间","hotStime","热搜开始时间","hotEtime","热搜结束时间","urgentStime","加急开始时间","urgentEtime","加急结束时间";<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -212,7 +212,7 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="")
BigDecimal shareFee; BigDecimal shareFee;
@ApiModelProperty(notes="开启分享赚功能0-否1是",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="开启分享赚功能0-否1-待付款，2已付款",allowEmptyValue=true,example="",allowableValues="")
String oshare; String oshare;
@ApiModelProperty(notes="是否众包0否1是，众包属于外购的一种",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="是否众包0否1是，众包属于外购的一种",allowEmptyValue=true,example="",allowableValues="")
@ -245,16 +245,16 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="保障要求编号列表，多个逗号分割",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="保障要求编号列表，多个逗号分割",allowEmptyValue=true,example="",allowableValues="")
String supRequires; String supRequires;
@ApiModelProperty(notes="是否为热搜0否1是是否为置顶0否1是,每次热搜3天，3天后自动取消热搜",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否为热搜0否1待付款2已开通3已过期,每次热搜3天，3天后自动取消热搜",allowEmptyValue=true,example="",allowableValues="")
String hot; String hot;
@ApiModelProperty(notes="是否为置顶0否1是,每次置顶3天，3天后自动取消置顶",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否为置顶0否1待付款2已开通3已过期,每次置顶3天，3天后自动取消置顶",allowEmptyValue=true,example="",allowableValues="")
String top; String top;
@ApiModelProperty(notes="加急0否1是",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="加急0否1待付款2已开通3已过期",allowEmptyValue=true,example="",allowableValues="")
String urgent; String urgent;
@ApiModelProperty(notes="客服包办0否1是，理顺需求、比稿选稿",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="客服包办0否1待付款2已开通，理顺需求、比稿选稿",allowEmptyValue=true,example="",allowableValues="")
String crmSup; String crmSup;
@ApiModelProperty(notes="投标流程0-草稿，1-发布需求，2-用户投标，3雇主选标，4拓管赏金，5用户工作，6验收付款,7完结",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="投标流程0-草稿，1-发布需求，2-用户投标，3雇主选标，4拓管赏金，5用户工作，6验收付款,7完结",allowEmptyValue=true,example="",allowableValues="")
@ -266,7 +266,7 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="附件地址列表，逗号分割",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="附件地址列表，逗号分割",allowEmptyValue=true,example="",allowableValues="")
String filePaths; String filePaths;
@ApiModelProperty(notes="资金托管状况0-无须托管，1-已托管，2-已付款给服务商，3-已退款",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="资金托管状况0-无须托管，1-待付款，2-已托管资金，3-已付款给服务商，4-已退款",allowEmptyValue=true,example="",allowableValues="")
String estate; String estate;
@ApiModelProperty(notes="托管金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="托管金额",allowEmptyValue=true,example="",allowableValues="")

14
xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java
View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTaskOrder所有属性名: <br> * 实体 XmTaskOrder所有属性名: <br>
* "userid","用户编号","branchId","公司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","是否置顶","hot","是否热搜","crmSupFee","客服包办费用","urgentFee","加急费用","urgent","是否加急","crmSup","是否客服包办","efunds","托管金额","estate","资金托管状况0-无须托管，1-已托管，2-已付款给服务商，3-已退款","etoPlatTime","托管资金付款给平台的时间","etoDevTime","托管资金支付给服务商的时间","ebackTime","托管资金退回甲方时间","taskId","任务编号","topDays","置顶天数","hotDays","热搜天数","urgentDays","加急天数","urgentStime","加急开始时间","urgentEtime","加急结束时间","calcStatus","定时检查日期是否已过期，已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算，1-本周期已计算待下周期计算，2-结束","calcTime","计算时间","oshare","是否开启分享赚","shareFee","分享赚佣金";<br>
* "userid","用户编号","branchId","公司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","分享赚佣金";<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -95,10 +95,10 @@ public class XmTaskOrder implements java.io.Serializable {
@ApiModelProperty(notes="热搜结束时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="热搜结束时间",allowEmptyValue=true,example="",allowableValues="")
Date hotEtime; Date hotEtime;
@ApiModelProperty(notes="是否置顶",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否置顶0否1待付款2已开通3已过期",allowEmptyValue=true,example="",allowableValues="")
String top; String top;
@ApiModelProperty(notes="是否热搜",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否热搜0否1待付款2已开通3已过期",allowEmptyValue=true,example="",allowableValues="")
String hot; String hot;
@ApiModelProperty(notes="客服包办费用",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="客服包办费用",allowEmptyValue=true,example="",allowableValues="")
@ -107,16 +107,16 @@ public class XmTaskOrder implements java.io.Serializable {
@ApiModelProperty(notes="加急费用",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="加急费用",allowEmptyValue=true,example="",allowableValues="")
BigDecimal urgentFee; BigDecimal urgentFee;
@ApiModelProperty(notes="是否加急",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否加急0否1待付款2已开通3已过期",allowEmptyValue=true,example="",allowableValues="")
String urgent; String urgent;
@ApiModelProperty(notes="是否客服包办",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否客服包办0否1待付款2已开通3已过期",allowEmptyValue=true,example="",allowableValues="")
String crmSup; String crmSup;
@ApiModelProperty(notes="托管金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="托管金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal efunds; BigDecimal efunds;
@ApiModelProperty(notes="资金托管状况0-无须托管，1-已托管，2-已付款给服务商，3-已退款",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="资金托管状况0-无须托管，1-待付款，2-已托管资金，3-已付款给服务商，4-已退款",allowEmptyValue=true,example="",allowableValues="")
String estate; String estate;
@ApiModelProperty(notes="托管资金付款给平台的时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="托管资金付款给平台的时间",allowEmptyValue=true,example="",allowableValues="")
@ -152,7 +152,7 @@ public class XmTaskOrder implements java.io.Serializable {
@ApiModelProperty(notes="计算时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="计算时间",allowEmptyValue=true,example="",allowableValues="")
Date calcTime; Date calcTime;
@ApiModelProperty(notes="是否开启分享赚",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否开启分享赚0否1待付款2已开通3已过期",allowEmptyValue=true,example="",allowableValues="")
String oshare; String oshare;
@ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="")

27
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
View File

@ -468,23 +468,16 @@
</update> </update>
<!-- 批量修改某几个字段 --> <!-- 批量修改某几个字段 -->
<update id="editSomeFields" parameterType="HashMap">
update xm_task res
<set>
<include refid="someFieldSet"/>
<if test="taskState!=null and taskState!=''">
res.rate=case when res.task_state in('2','3','4') then 100
when res.budget_workload>0 then ifnull(res.act_workload,0)*100/ res.budget_workload
when res.act_workload>0 then 100
else res.rate end
</if>
</set>
where id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</update>
<delete id="editSomeFields" parameterType="HashMap">
update xm_task
<set>
<include refid="someFieldSet"/>
</set>
where (id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</delete>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_task delete from xm_task

Write Preview
Loading…
Cancel
Save