From 027569804b6eb1b93d78e4583ea61b6c09c18e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 17 Jul 2021 15:25:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/entity/XmTask.java | 34 ++----------------- .../mapper/xm/core/dao/XmTaskMapper.xml | 12 ++----- 2 files changed, 4 insertions(+), 42 deletions(-) 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 5cb71901..2d1fac53 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,iterationId,iterationName,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;
* 表 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,iteration_id,iteration_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;
* 当前主键(包括多主键):
* id;
*/ @@ -152,12 +152,6 @@ public class XmTask implements java.io.Serializable { @ApiModelProperty(notes="归属功能名称",allowEmptyValue=true,example="",allowableValues="") String menuName; - @ApiModelProperty(notes="迭代编号",allowEmptyValue=true,example="",allowableValues="") - String iterationId; - - @ApiModelProperty(notes="迭代名称",allowEmptyValue=true,example="",allowableValues="") - String iterationName; - @ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="") String productId; @@ -443,18 +437,6 @@ public class XmTask implements java.io.Serializable { public void setMenuName(String menuName) { this.menuName = menuName; } - /** - * 迭代编号 - **/ - public void setIterationId(String iterationId) { - this.iterationId = iterationId; - } - /** - * 迭代名称 - **/ - public void setIterationName(String iterationName) { - this.iterationName = iterationName; - } /** * 产品编号 **/ @@ -744,18 +726,6 @@ public class XmTask implements java.io.Serializable { public String getMenuName() { return this.menuName; } - /** - * 迭代编号 - **/ - public String getIterationId() { - return this.iterationId; - } - /** - * 迭代名称 - **/ - public String getIterationName() { - return this.iterationName; - } /** * 产品编号 **/ 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 2cef73b5..ffc4098c 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 @@ -193,7 +193,7 @@ insert into XM.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},#{iterationId},#{iterationName},#{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} ) @@ -258,7 +258,7 @@ - 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,iteration_id,iteration_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 @@ -307,8 +307,6 @@ and res.settle_schemel = #{settleSchemel} and res.menu_id = #{menuId} and res.menu_name = #{menuName} - and res.iteration_id = #{iterationId} - and res.iteration_name = #{iterationName} and res.product_id = #{productId} and res.product_name = #{productName} and res.cbranch_id = #{cbranchId} @@ -359,8 +357,6 @@ settle_schemel = #{settleSchemel}, menu_id = #{menuId}, menu_name = #{menuName}, - iteration_id = #{iterationId}, - iteration_name = #{iterationName}, product_id = #{productId}, product_name = #{productName}, cbranch_id = #{cbranchId}, @@ -410,8 +406,6 @@ settle_schemel = #{settleSchemel}, menu_id = #{menuId}, menu_name = #{menuName}, - iteration_id = #{iterationId}, - iteration_name = #{iterationName}, product_id = #{productId}, product_name = #{productName}, cbranch_id = #{cbranchId}, @@ -462,8 +456,6 @@ settle_schemel = #{item.settleSchemel}, menu_id = #{item.menuId}, menu_name = #{item.menuName}, - iteration_id = #{item.iterationId}, - iteration_name = #{item.iterationName}, product_id = #{item.productId}, product_name = #{item.productName}, cbranch_id = #{item.cbranchId},