diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java index 7f63fa31..48186284 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java @@ -7,9 +7,9 @@ import java.util.Date; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmMenu所有属性名:
- * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime;
+ * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames;
* 表 xm_menu 功能表的所有字段名:
- * menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime;
+ * menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names;
* 当前主键(包括多主键):
* menu_id;
*/ @@ -81,6 +81,12 @@ public class XmMenu implements java.io.Serializable { @ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="") Date ltime; + + @ApiModelProperty(notes="标签编号,逗号分割",allowEmptyValue=true,example="",allowableValues="") + String tagIds; + + @ApiModelProperty(notes="标签名称,逗号分割",allowEmptyValue=true,example="",allowableValues="") + String tagNames; /**功能编号**/ public XmMenu(String menuId) { @@ -217,6 +223,18 @@ public class XmMenu implements java.io.Serializable { public void setLtime(Date ltime) { this.ltime = ltime; } + /** + * 标签编号,逗号分割 + **/ + public void setTagIds(String tagIds) { + this.tagIds = tagIds; + } + /** + * 标签名称,逗号分割 + **/ + public void setTagNames(String tagNames) { + this.tagNames = tagNames; + } /** * 功能编号 @@ -344,5 +362,17 @@ public class XmMenu implements java.io.Serializable { public Date getLtime() { return this.ltime; } + /** + * 标签编号,逗号分割 + **/ + public String getTagIds() { + return this.tagIds; + } + /** + * 标签名称,逗号分割 + **/ + public String getTagNames() { + return this.tagNames; + } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java index e92b98c8..b4094b3e 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java @@ -8,9 +8,9 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProjectPhase所有属性名:
- * id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,projectBaselineId,bizProcInstId,bizFlowState,phaseBudgetWorkload,phaseActWorkload,phaseActInnerUserWorkload,phaseActOutUserWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,actNouserAt,actInnerUserAt,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt,actRate,phaseStatus,actOutUserAt,taskCnt,finishTaskCnt,iterationCnt,calcTime,taskBudgetWorkload,taskBudgetAt,mngUserid,mngUsername,milestone,pleaf;
- * 表 XM.xm_project_phase 项目阶段模板的所有字段名:
- * id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf;
+ * id,phaseName,remark,parentPhaseId,branchId,projectId,beginDate,endDate,phaseBudgetHours,phaseBudgetStaffNu,ctime,phaseBudgetNouserAt,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,projectBaselineId,bizProcInstId,bizFlowState,phaseBudgetWorkload,phaseActWorkload,phaseActInnerUserWorkload,phaseActOutUserWorkload,taskType,planType,seqNo,phaseBudgetInnerUserWorkload,phaseBudgetOutUserWorkload,actNouserAt,actInnerUserAt,phaseBudgetInnerUserPrice,phaseBudgetOutUserPrice,phaseBudgetOutUserCnt,phaseBudgetInnerUserCnt,actRate,phaseStatus,actOutUserAt,taskCnt,finishTaskCnt,iterationCnt,calcTime,taskBudgetWorkload,taskBudgetAt,mngUserid,mngUsername,milestone,pleaf,tagIds,tagNames,ntype,childrenCnt,ltime;
+ * 表 xm_project_phase 项目阶段模板的所有字段名:
+ * id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime;
* 当前主键(包括多主键):
* id;
*/ @@ -154,6 +154,21 @@ public class XmProjectPhase implements java.io.Serializable { @ApiModelProperty(notes="节点是否为叶子节点",allowEmptyValue=true,example="",allowableValues="") String pleaf; + + @ApiModelProperty(notes="标签编号，逗号分割",allowEmptyValue=true,example="",allowableValues="") + String tagIds; + + @ApiModelProperty(notes="标签名称，逗号分割",allowEmptyValue=true,example="",allowableValues="") + String tagNames; + + @ApiModelProperty(notes="节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点",allowEmptyValue=true,example="",allowableValues="") + String ntype; + + @ApiModelProperty(notes="儿子节点个数",allowEmptyValue=true,example="",allowableValues="") + Integer childrenCnt; + + @ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="") + Date ltime; /**阶段主键**/ public XmProjectPhase(String id) { @@ -434,6 +449,36 @@ public class XmProjectPhase implements java.io.Serializable { public void setPleaf(String pleaf) { this.pleaf = pleaf; } + /** + * 标签编号，逗号分割 + **/ + public void setTagIds(String tagIds) { + this.tagIds = tagIds; + } + /** + * 标签名称，逗号分割 + **/ + public void setTagNames(String tagNames) { + this.tagNames = tagNames; + } + /** + * 节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点 + **/ + public void setNtype(String ntype) { + this.ntype = ntype; + } + /** + * 儿子节点个数 + **/ + public void setChildrenCnt(Integer childrenCnt) { + this.childrenCnt = childrenCnt; + } + /** + * 更新时间 + **/ + public void setLtime(Date ltime) { + this.ltime = ltime; + } /** * 阶段主键 @@ -705,5 +750,35 @@ public class XmProjectPhase implements java.io.Serializable { public String getPleaf() { return this.pleaf; } + /** + * 标签编号，逗号分割 + **/ + public String getTagIds() { + return this.tagIds; + } + /** + * 标签名称，逗号分割 + **/ + public String getTagNames() { + return this.tagNames; + } + /** + * 节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点 + **/ + public String getNtype() { + return this.ntype; + } + /** + * 儿子节点个数 + **/ + public Integer getChildrenCnt() { + return this.childrenCnt; + } + /** + * 更新时间 + **/ + public Date getLtime() { + return this.ltime; + } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTask.java b/xm-core/src/main/java/com/xm/core/entity/XmTask.java index 2d1fac53..9cd3b617 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTask.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTask.java @@ -8,9 +8,9 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTask所有属性名:
- * id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,projectPhaseId,projectPhaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid;
- * 表 XM.xm_task xm_task的所有字段名:
- * 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_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid;
+ * id,name,parentTaskid,parentTaskname,projectId,projectName,level,sortLevel,executorUserid,executorUsername,preTaskid,preTaskname,startTime,endTime,milestone,description,remarks,createUserid,createUsername,createTime,rate,budgetCost,budgetWorkload,actCost,actWorkload,taskState,taskType,taskClass,toTaskCenter,actStartTime,actEndTime,bizProcInstId,bizFlowState,projectPhaseId,projectPhaseName,taskSkillNames,exeUsernames,taskSkillIds,exeUserids,taskOut,planType,settleSchemel,menuId,menuName,productId,productName,cbranchId,cdeptid,tagIds,tagNames,ntype,childrenCnt,ltime;
+ * 表 xm_task xm_task的所有字段名:
+ * 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_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime;
* 当前主键(包括多主键):
* id;
*/ @@ -163,6 +163,21 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="创建部门",allowEmptyValue=true,example="",allowableValues="") String cdeptid; + + @ApiModelProperty(notes="标签编号，逗号分割",allowEmptyValue=true,example="",allowableValues="") + String tagIds; + + @ApiModelProperty(notes="标签名称，逗号分割",allowEmptyValue=true,example="",allowableValues="") + String tagNames; + + @ApiModelProperty(notes="节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点",allowEmptyValue=true,example="",allowableValues="") + String ntype; + + @ApiModelProperty(notes="儿子节点个数",allowEmptyValue=true,example="",allowableValues="") + Integer childrenCnt; + + @ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="") + Date ltime; /**任务编号**/ public XmTask(String id) { @@ -461,6 +476,36 @@ public class XmTask implements java.io.Serializable { public void setCdeptid(String cdeptid) { this.cdeptid = cdeptid; } + /** + * 标签编号，逗号分割 + **/ + public void setTagIds(String tagIds) { + this.tagIds = tagIds; + } + /** + * 标签名称，逗号分割 + **/ + public void setTagNames(String tagNames) { + this.tagNames = tagNames; + } + /** + * 节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点 + **/ + public void setNtype(String ntype) { + this.ntype = ntype; + } + /** + * 儿子节点个数 + **/ + public void setChildrenCnt(Integer childrenCnt) { + this.childrenCnt = childrenCnt; + } + /** + * 更新时间 + **/ + public void setLtime(Date ltime) { + this.ltime = ltime; + } /** * 任务编号 @@ -750,5 +795,35 @@ public class XmTask implements java.io.Serializable { public String getCdeptid() { return this.cdeptid; } + /** + * 标签编号，逗号分割 + **/ + public String getTagIds() { + return this.tagIds; + } + /** + * 标签名称，逗号分割 + **/ + public String getTagNames() { + return this.tagNames; + } + /** + * 节点类型0-任务，1-任务集。任务集下建任务，任务下不允许建立任何子节点 + **/ + public String getNtype() { + return this.ntype; + } + /** + * 儿子节点个数 + **/ + public Integer getChildrenCnt() { + return this.childrenCnt; + } + /** + * 更新时间 + **/ + public Date getLtime() { + return this.ltime; + } } \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 4299cdff..9a917277 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -5,12 +5,12 @@ - - and (res.menu_id) in - - ( #{item}) - - + + and (res.menu_id) in + + ( #{item}) + + and not exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id) @@ -21,7 +21,7 @@ and res.menu_name like #{key} and res.pmenu_id is null - + SELECT - sum( res.phase_budget_workload ) AS phase_budget_workload, - sum( res.phase_budget_nouser_at ) AS phase_budget_nouser_at, - sum( res.phase_budget_inner_user_at ) AS phase_budget_inner_user_at, - sum( res.phase_budget_out_user_at ) AS phase_budget_out_user_at, - p.plan_nouser_at, - p.plan_inner_user_at, - p.plan_out_user_at, - p.locked, - p.plan_workload, - p.total_receivables, - p.budget_margin_rate, - p.contract_amt, - p.plan_inner_user_price, - p.plan_out_user_price, - p.plan_out_user_cnt, - p.plan_inner_user_cnt, - p.plan_working_hours, - p.plan_total_cost + sum( res.phase_budget_workload ) AS phase_budget_workload, + sum( res.phase_budget_nouser_at ) AS phase_budget_nouser_at, + sum( res.phase_budget_inner_user_at ) AS phase_budget_inner_user_at, + sum( res.phase_budget_out_user_at ) AS phase_budget_out_user_at, + p.plan_nouser_at, + p.plan_inner_user_at, + p.plan_out_user_at, + p.locked, + p.plan_workload, + p.total_receivables, + p.budget_margin_rate, + p.contract_amt, + p.plan_inner_user_price, + p.plan_out_user_price, + p.plan_out_user_cnt, + p.plan_inner_user_cnt, + p.plan_working_hours, + p.plan_total_cost FROM - XM.xm_project p - LEFT JOIN XM.xm_project_phase res - ON p.id = res.project_id - and res.id not in - - #{item} - - + XM.xm_project p + LEFT JOIN XM.xm_project_phase res + ON p.id = res.project_id + and res.id not in + + #{item} + + where p.id=#{projectId} - {call load_tasks_to_xm_project_phase(#{projectId,mode=IN})} + {call load_tasks_to_xm_project_phase(#{projectId,mode=IN})} select count(1) from xm_project_phase res where res.parent_phase_id = #{id} + + @@ -57,23 +70,10 @@ @@ -110,27 +110,27 @@ insert into xm_project_phase( ) values ( - #{id},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{phaseBudgetHours},#{phaseBudgetStaffNu},#{ctime},#{phaseBudgetNouserAt},#{phaseBudgetInnerUserAt},#{phaseBudgetOutUserAt},#{projectBaselineId},#{bizProcInstId},#{bizFlowState},#{phaseBudgetWorkload},#{phaseActWorkload},#{phaseActInnerUserWorkload},#{phaseActOutUserWorkload},#{taskType},#{planType},#{seqNo},#{phaseBudgetInnerUserWorkload},#{phaseBudgetOutUserWorkload},#{actNouserAt},#{actInnerUserAt},#{phaseBudgetInnerUserPrice},#{phaseBudgetOutUserPrice},#{phaseBudgetOutUserCnt},#{phaseBudgetInnerUserCnt},#{actRate},#{phaseStatus},#{actOutUserAt},#{taskCnt},#{finishTaskCnt},#{iterationCnt},#{calcTime},#{taskBudgetWorkload},#{taskBudgetAt},#{mngUserid},#{mngUsername},#{milestone},#{pleaf} + #{id},#{phaseName},#{remark},#{parentPhaseId},#{branchId},#{projectId},#{beginDate},#{endDate},#{phaseBudgetHours},#{phaseBudgetStaffNu},#{ctime},#{phaseBudgetNouserAt},#{phaseBudgetInnerUserAt},#{phaseBudgetOutUserAt},#{projectBaselineId},#{bizProcInstId},#{bizFlowState},#{phaseBudgetWorkload},#{phaseActWorkload},#{phaseActInnerUserWorkload},#{phaseActOutUserWorkload},#{taskType},#{planType},#{seqNo},#{phaseBudgetInnerUserWorkload},#{phaseBudgetOutUserWorkload},#{actNouserAt},#{actInnerUserAt},#{phaseBudgetInnerUserPrice},#{phaseBudgetOutUserPrice},#{phaseBudgetOutUserCnt},#{phaseBudgetInnerUserCnt},#{actRate},#{phaseStatus},#{actOutUserAt},#{taskCnt},#{finishTaskCnt},#{iterationCnt},#{calcTime},#{taskBudgetWorkload},#{taskBudgetAt},#{mngUserid},#{mngUsername},#{milestone},#{pleaf},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime} ) - delete from xm_project_phase + delete from xm_project_phase res - 1=2 + - delete from xm_project_phase + delete from xm_project_phase where id = #{id} - update xm_project_phase + update xm_project_phase @@ -139,7 +139,7 @@ - update xm_project_phase + update xm_project_phase @@ -154,7 +154,7 @@ - update xm_project_phase + update xm_project_phase set where id = #{item.id} @@ -162,20 +162,18 @@ - delete from xm_project_phase + delete from xm_project_phase where - (id) - in + (id) in - ( #{item.id} - ) + ( #{item.id} ) - id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf + id,phase_name,remark,parent_phase_id,branch_id,project_id,begin_date,end_date,phase_budget_hours,phase_budget_staff_nu,ctime,phase_budget_nouser_at,phase_budget_inner_user_at,phase_budget_out_user_at,project_baseline_id,biz_proc_inst_id,biz_flow_state,phase_budget_workload,phase_act_workload,phase_act_inner_user_workload,phase_act_out_user_workload,task_type,plan_type,seq_no,phase_budget_inner_user_workload,phase_budget_out_user_workload,act_nouser_at,act_inner_user_at,phase_budget_inner_user_price,phase_budget_out_user_price,phase_budget_out_user_cnt,phase_budget_inner_user_cnt,act_rate,phase_status,act_out_user_at,task_cnt,finish_task_cnt,iteration_cnt,calc_time,task_budget_workload,task_budget_at,mng_userid,mng_username,milestone,pleaf,tag_ids,tag_names,ntype,children_cnt,ltime @@ -225,6 +223,11 @@ and res.mng_username = #{mngUsername} and res.milestone = #{milestone} and res.pleaf = #{pleaf} + and res.tag_ids = #{tagIds} + and res.tag_names = #{tagNames} + and res.ntype = #{ntype} + and res.children_cnt = #{childrenCnt} + and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') @@ -271,7 +274,12 @@ mng_userid = #{mngUserid}, mng_username = #{mngUsername}, milestone = #{milestone}, - pleaf = #{pleaf} + pleaf = #{pleaf}, + tag_ids = #{tagIds}, + tag_names = #{tagNames}, + ntype = #{ntype}, + children_cnt = #{childrenCnt}, + ltime = #{ltime} phase_name = #{phaseName}, @@ -318,6 +326,11 @@ mng_username = #{mngUsername}, milestone = #{milestone}, pleaf = #{pleaf}, + tag_ids = #{tagIds}, + tag_names = #{tagNames}, + ntype = #{ntype}, + children_cnt = #{childrenCnt}, + ltime = #{ltime}, @@ -364,6 +377,11 @@ mng_userid = #{item.mngUserid}, mng_username = #{item.mngUsername}, milestone = #{item.milestone}, - pleaf = #{item.pleaf} + pleaf = #{item.pleaf}, + tag_ids = #{item.tagIds}, + tag_names = #{item.tagNames}, + ntype = #{item.ntype}, + children_cnt = #{item.childrenCnt}, + ltime = #{item.ltime} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 1fba6bc3..20d6385e 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -3,8 +3,49 @@ - - + + + + and (res.id) in + + ( #{item}) + + and res.create_time > #{createTimeStart} + and res.create_time < #{createTimeEnd} + + and (res.parent_taskid = '' or res.parent_taskid IS NULL) + + + + and exists ( select 1 from xm_task_execuser exe where exe.task_id=res.id and exe.userid=#{userid} + + and exe.status=#{myExecuserStatus} + + ) + + + + and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.project_id=res.project_id and f.task_id=res.id ) + + + and exists ( select 1 from xm_task_skill f where f.task_id=res.id and f.task_skill_id in + + #{item} + + ) + + + and ( exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id ) + or exists ( select 1 from xm_task_execuser exe where exe.project_id=res.project_id and exe.userid=#{compete}) + ) + + + + and exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id and im.iteration_id=#{iterationId}) + + and res.name like #{key} + and res.rate != '100' + @@ -27,40 +68,40 @@ update xm_task set menu_id = #{menuId}, menu_name = #{menuName},product_id=#{productId},product_name=#{productName} where id = #{id} - + + parameterType="HashMap" + useGeneratedKeys="false" keyProperty="id"> insert into xm_task_process_approva ( - id,xm_task_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id + id,xm_task_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id ) values ( - #{id},#{xmTaskId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} + #{id},#{xmTaskId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} ) - + + parameterType="HashMap"> update xm_task b ,XM.xm_task_process_approva pa - - pa.agree = #{agree}, - pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, - pa.task_name = #{taskName}, - pa.comment_msg = #{commentMsg}, - pa.flow_last_time = now(), - pa.event_name = #{eventName}, - pa.flow_state=#{flowState}, - b.biz_flow_state=#{bizFlowState}, - b.biz_proc_inst_id=#{bizProcInstId}, - + + pa.agree = #{agree}, + pa.act_id = #{actId}, + pa.assignee = #{assignee}, + pa.assignee_name = #{assigneeName}, + pa.task_name = #{taskName}, + pa.comment_msg = #{commentMsg}, + pa.flow_last_time = now(), + pa.event_name = #{eventName}, + pa.flow_state=#{flowState}, + b.biz_flow_state=#{bizFlowState}, + b.biz_proc_inst_id=#{bizProcInstId}, + where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.xm_task_id + and b.id=pa.xm_task_id + parameterType="HashMap"> update xm_task_process_approva pa set pa.flow_state='2' where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} @@ -68,42 +109,43 @@ delete from xm_task - where biz_proc_inst_id=#{procInstId} + where biz_proc_inst_id=#{procInstId} + @@ -113,50 +155,11 @@ select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_task res left join xm_task_process_approva pa on res.id=pa.xm_task_id and res.biz_proc_inst_id=pa.proc_inst_id left join xm_project p on p.id=res.project_id - - and - id in - - #{item} - - - - and res.create_time > #{createTimeStart} - and res.create_time < #{createTimeEnd} + + - and (res.parent_taskid = '' or res.parent_taskid IS NULL) - - - - and exists ( select 1 from xm_task_execuser exe where exe.task_id=res.id and exe.userid=#{userid} - - and exe.status=#{myExecuserStatus} - - ) - - - - and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.project_id=res.project_id and f.task_id=res.id ) - - - and exists ( select 1 from xm_task_skill f where f.task_id=res.id and f.task_skill_id in - - #{item} - - ) - - - and ( exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id ) - or exists ( select 1 from xm_task_execuser exe where exe.project_id=res.project_id and exe.userid=#{compete}) - ) - - - - and exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id and im.iteration_id=#{iterationId}) - - and res.name like #{key} - and res.rate != '100' + order by res.sort_level asc @@ -193,27 +196,27 @@ insert into xm_task( ) values ( - #{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{projectPhaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{productName},#{cbranchId},#{cdeptid} + #{id},#{name},#{parentTaskid},#{parentTaskname},#{projectId},#{projectName},#{level},#{sortLevel},#{executorUserid},#{executorUsername},#{preTaskid},#{preTaskname},#{startTime},#{endTime},#{milestone},#{description},#{remarks},#{createUserid},#{createUsername},#{createTime},#{rate},#{budgetCost},#{budgetWorkload},#{actCost},#{actWorkload},#{taskState},#{taskType},#{taskClass},#{toTaskCenter},#{actStartTime},#{actEndTime},#{bizProcInstId},#{bizFlowState},#{projectPhaseId},#{projectPhaseName},#{taskSkillNames},#{exeUsernames},#{taskSkillIds},#{exeUserids},#{taskOut},#{planType},#{settleSchemel},#{menuId},#{menuName},#{productId},#{productName},#{cbranchId},#{cdeptid},#{tagIds},#{tagNames},#{ntype},#{childrenCnt},#{ltime} ) - delete from xm_task + delete from xm_task res - 1=2 + - delete from xm_task + delete from xm_task where id = #{id} - update xm_task + update xm_task @@ -222,7 +225,7 @@ - update xm_task + update xm_task @@ -237,7 +240,7 @@ - update xm_task + update xm_task set where id = #{item.id} @@ -245,20 +248,18 @@ - delete from xm_task + delete from xm_task where - (id) - in + (id) in - ( #{item.id} - ) + ( #{item.id} ) - 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_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid + 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_cost,budget_workload,act_cost,act_workload,task_state,task_type,task_class,to_task_center,act_start_time,act_end_time,biz_proc_inst_id,biz_flow_state,project_phase_id,project_phase_name,task_skill_names,exe_usernames,task_skill_ids,exe_userids,task_out,plan_type,settle_schemel,menu_id,menu_name,product_id,product_name,cbranch_id,cdeptid,tag_ids,tag_names,ntype,children_cnt,ltime @@ -311,6 +312,11 @@ and res.product_name = #{productName} and res.cbranch_id = #{cbranchId} and res.cdeptid = #{cdeptid} + and res.tag_ids = #{tagIds} + and res.tag_names = #{tagNames} + and res.ntype = #{ntype} + and res.children_cnt = #{childrenCnt} + and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') @@ -360,7 +366,12 @@ product_id = #{productId}, product_name = #{productName}, cbranch_id = #{cbranchId}, - cdeptid = #{cdeptid} + cdeptid = #{cdeptid}, + tag_ids = #{tagIds}, + tag_names = #{tagNames}, + ntype = #{ntype}, + children_cnt = #{childrenCnt}, + ltime = #{ltime} name = #{name}, @@ -410,6 +421,11 @@ product_name = #{productName}, cbranch_id = #{cbranchId}, cdeptid = #{cdeptid}, + tag_ids = #{tagIds}, + tag_names = #{tagNames}, + ntype = #{ntype}, + children_cnt = #{childrenCnt}, + ltime = #{ltime}, @@ -459,6 +475,11 @@ product_id = #{item.productId}, product_name = #{item.productName}, cbranch_id = #{item.cbranchId}, - cdeptid = #{item.cdeptid} + cdeptid = #{item.cdeptid}, + tag_ids = #{item.tagIds}, + tag_names = #{item.tagNames}, + ntype = #{item.ntype}, + children_cnt = #{item.childrenCnt}, + ltime = #{item.ltime} \ No newline at end of file