Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
0b2d3a94cc
  1. 49
      xm-core/src/main/java/com/xm/core/entity/XmTask.java
  2. 7
      xm-core/src/main/java/com/xm/core/service/client/MkClient.java
  3. 34
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

49
xm-core/src/main/java/com/xm/core/entity/XmTask.java

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTask所有属性名: <br>
* 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;<br>
* 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,crowd,shareFee,oshare;<br>
* xm_task xm_task的所有字段名: <br>
* 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;<br>
* 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,crowd,share_fee,oshare;<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -209,6 +209,15 @@ public class XmTask implements java.io.Serializable {
@ApiModelProperty(notes="原始预估工作量,budget_workload发生变化后,进行备份",allowEmptyValue=true,example="",allowableValues="")
BigDecimal initWorkload;
@ApiModelProperty(notes="是否众包0-否1是-众包互联网上才能看见",allowEmptyValue=true,example="",allowableValues="")
String crowd;
@ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="")
BigDecimal shareFee;
@ApiModelProperty(notes="开启分享赚功能0-否1是",allowEmptyValue=true,example="",allowableValues="")
String oshare;
/**任务编号**/
public XmTask(String id) {
this.id = id;
@ -596,6 +605,24 @@ public class XmTask implements java.io.Serializable {
public void setInitWorkload(BigDecimal initWorkload) {
this.initWorkload = initWorkload;
}
/**
* 是否众包0-否1是-众包互联网上才能看见
**/
public void setCrowd(String crowd) {
this.crowd = crowd;
}
/**
* 分享赚佣金
**/
public void setShareFee(BigDecimal shareFee) {
this.shareFee = shareFee;
}
/**
* 开启分享赚功能0-否1是
**/
public void setOshare(String oshare) {
this.oshare = oshare;
}
/**
* 任务编号
@ -975,5 +1002,23 @@ public class XmTask implements java.io.Serializable {
public BigDecimal getInitWorkload() {
return this.initWorkload;
}
/**
* 是否众包0-否1是-众包互联网上才能看见
**/
public String getCrowd() {
return this.crowd;
}
/**
* 分享赚佣金
**/
public BigDecimal getShareFee() {
return this.shareFee;
}
/**
* 开启分享赚功能0-否1是
**/
public String getOshare() {
return this.oshare;
}
}

7
xm-core/src/main/java/com/xm/core/service/client/MkClient.java

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.mdp.core.entity.Tips;
import com.mdp.core.utils.BaseUtils;
import com.mdp.micro.client.CallBizService;
import com.mdp.mq.queue.Push;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@ -21,6 +22,9 @@ public class MkClient {
@Autowired
StringRedisTemplate strRedisTemplate;
@Autowired
Push push;
/**
* execOrder.setOrderId(sequence.getReqFlowNo());
* execOrder.setActNum(new BigDecimal("1"));
@ -46,7 +50,8 @@ public class MkClient {
params.put("totalPrice",totalPrice);
params.put("workload",workload);
params.put("entityDesc",entityDesc);
strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
push.leftPush("xm_task_settle",params);
// strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
return tips;
}
}

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

@ -494,7 +494,7 @@
</select>
<!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmTask" resultType="long">
select count(1) from xm_task res
select count(*) from xm_task res
<where>
<include refid="where"/>
</where>
@ -504,7 +504,7 @@
insert into xm_task(
<include refid="columns"/>
) 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}
#{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},#{crowd},#{shareFee},#{oshare}
)
</insert>
@ -554,6 +554,18 @@
where id = #{item.id}
</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 from xm_task
@ -567,7 +579,7 @@
<!--sql片段 列-->
<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
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,crowd,share_fee,oshare
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -635,6 +647,9 @@
<if test="wtype != null and wtype != ''"> and res.wtype = #{wtype} </if>
<if test="bctrl != null and bctrl != ''"> and res.bctrl = #{bctrl} </if>
<if test="initWorkload != null and initWorkload != ''"> and res.init_workload = #{initWorkload} </if>
<if test="crowd != null and crowd != ''"> and res.crowd = #{crowd} </if>
<if test="shareFee != null and shareFee != ''"> and res.share_fee = #{shareFee} </if>
<if test="oshare != null and oshare != ''"> and res.oshare = #{oshare} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -699,7 +714,10 @@
ptype = #{ptype},
wtype = #{wtype},
bctrl = #{bctrl},
init_workload = #{initWorkload}
init_workload = #{initWorkload},
crowd = #{crowd},
share_fee = #{shareFee},
oshare = #{oshare}
</sql>
<sql id="someFieldSet">
<if test="name != null and name != ''"> name = #{name}, </if>
@ -764,6 +782,9 @@
<if test="wtype != null and wtype != ''"> wtype = #{wtype}, </if>
<if test="bctrl != null and bctrl != ''"> bctrl = #{bctrl}, </if>
<if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload}, </if>
<if test="crowd != null and crowd != ''"> crowd = #{crowd}, </if>
<if test="shareFee != null and shareFee != ''"> share_fee = #{shareFee}, </if>
<if test="oshare != null and oshare != ''"> oshare = #{oshare}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -828,6 +849,9 @@
ptype = #{item.ptype},
wtype = #{item.wtype},
bctrl = #{item.bctrl},
init_workload = #{item.initWorkload}
init_workload = #{item.initWorkload},
crowd = #{item.crowd},
share_fee = #{item.shareFee},
oshare = #{item.oshare}
</sql>
</mapper>
Loading…
Cancel
Save