From e0972c6bb7c29101e45c887ed03cbfe073de896a 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:22:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E8=BF=AD=E4=BB=A3=E3=80=81=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=81=E4=BA=A7=E5=93=81=E3=80=81=E9=98=B6=E6=AE=B5=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/entity/XmIteration.java | 26 +++-- .../main/java/com/xm/core/entity/XmMenu.java | 24 ++++- .../java/com/xm/core/entity/XmProduct.java | 24 ++++- .../java/com/xm/core/entity/XmProject.java | 41 ++++++-- .../com/xm/core/entity/XmProjectPhase.java | 34 ++++++- .../mapper/xm/core/dao/XmIterationMapper.xml | 65 ++++++------ .../mapper/xm/core/dao/XmMenuMapper.xml | 58 ++++++----- .../mapper/xm/core/dao/XmProductMapper.xml | 43 ++++---- .../mapper/xm/core/dao/XmProjectMapper.xml | 98 ++++++++++--------- .../xm/core/dao/XmProjectPhaseMapper.xml | 16 ++- 10 files changed, 284 insertions(+), 145 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIteration.java b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java index dd9cf5ac..54286396 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmIteration.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java @@ -1,17 +1,16 @@ -package com.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.math.BigDecimal; import java.util.Date; +import java.math.BigDecimal; /** - * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmIteration所有属性名:
- * id,branchId,iterationName,startTime,endTime,onlineTime,pid,adminUserid,adminUsername,ctime,budgetCost,budgetWorkload,seqNo,istatus,cuserid,cusername,remark;
+ * id,branchId,iterationName,startTime,endTime,onlineTime,pid,adminUserid,adminUsername,ctime,budgetCost,budgetWorkload,seqNo,istatus,cuserid,cusername,remark,iphase;
* 表 XM.xm_iteration 迭代定义的所有字段名:
- * id,branch_id,iteration_name,start_time,end_time,online_time,pid,admin_userid,admin_username,ctime,budget_cost,budget_workload,seq_no,istatus,cuserid,cusername,remark;
+ * id,branch_id,iteration_name,start_time,end_time,online_time,pid,admin_userid,admin_username,ctime,budget_cost,budget_workload,seq_no,istatus,cuserid,cusername,remark,iphase;
* 当前主键(包括多主键):
* id;
*/ @@ -71,6 +70,9 @@ public class XmIteration implements java.io.Serializable { @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="") String remark; + + @ApiModelProperty(notes="迭代阶段:0未开始,1需求评审,2计划会,3研发中,4测试中,5迭代上线,6已完成",allowEmptyValue=true,example="",allowableValues="") + String iphase; /**迭代编码**/ public XmIteration(String id) { @@ -183,6 +185,12 @@ public class XmIteration implements java.io.Serializable { public void setRemark(String remark) { this.remark = remark; } + /** + * 迭代阶段:0未开始,1需求评审,2计划会,3研发中,4测试中,5迭代上线,6已完成 + **/ + public void setIphase(String iphase) { + this.iphase = iphase; + } /** * 迭代编码 @@ -286,5 +294,11 @@ public class XmIteration implements java.io.Serializable { public String getRemark() { return this.remark; } + /** + * 迭代阶段:0未开始,1需求评审,2计划会,3研发中,4测试中,5迭代上线,6已完成 + **/ + public String getIphase() { + return this.iphase; + } } \ No newline at end of file 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 8af98c09..55175fb9 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 @@ -1,14 +1,15 @@ -package com.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; /** - * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmMenu所有属性名:
- * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername;
+ * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime;
* 表 XM.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;
+ * 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;
* 当前主键(包括多主键):
* menu_id;
*/ @@ -65,6 +66,9 @@ public class XmMenu implements java.io.Serializable { @ApiModelProperty(notes="故事管理员姓名",allowEmptyValue=true,example="",allowableValues="") String mmUsername; + + @ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="") + Date ctime; /**功能编号**/ public XmMenu(String menuId) { @@ -171,6 +175,12 @@ public class XmMenu implements java.io.Serializable { public void setMmUsername(String mmUsername) { this.mmUsername = mmUsername; } + /** + * 创建时间 + **/ + public void setCtime(Date ctime) { + this.ctime = ctime; + } /** * 功能编号 @@ -268,5 +278,11 @@ public class XmMenu implements java.io.Serializable { public String getMmUsername() { return this.mmUsername; } + /** + * 创建时间 + **/ + public Date getCtime() { + return this.ctime; + } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java index 24a72684..d91895a5 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java @@ -1,16 +1,15 @@ -package com.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - import java.util.Date; /** - * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProduct所有属性名:
- * id,productName,branchId,remark,version,pmUserid,pmUsername,ctime;
+ * id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid;
* 表 XM.xm_product 产品表的所有字段名:
- * id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime;
+ * id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid;
* 当前主键(包括多主键):
* id;
*/ @@ -43,6 +42,9 @@ public class XmProduct implements java.io.Serializable { @ApiModelProperty(notes="创建日期",allowEmptyValue=true,example="",allowableValues="") Date ctime; + + @ApiModelProperty(notes="归属部门",allowEmptyValue=true,example="",allowableValues="") + String deptid; /**产品编号**/ public XmProduct(String id) { @@ -101,6 +103,12 @@ public class XmProduct implements java.io.Serializable { public void setCtime(Date ctime) { this.ctime = ctime; } + /** + * 归属部门 + **/ + public void setDeptid(String deptid) { + this.deptid = deptid; + } /** * 产品编号 @@ -150,5 +158,11 @@ public class XmProduct implements java.io.Serializable { public Date getCtime() { return this.ctime; } + /** + * 归属部门 + **/ + public String getDeptid() { + return this.deptid; + } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java index 5bcb402d..666d92de 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java @@ -1,17 +1,16 @@ -package com.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.math.BigDecimal; import java.util.Date; +import java.math.BigDecimal; /** - * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProject所有属性名:
- * id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl;
+ * id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut;
* 表 XM.xm_project xm_project的所有字段名:
- * id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl;
+ * id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out;
* 当前主键(包括多主键):
* id;
*/ @@ -140,6 +139,12 @@ public class XmProject implements java.io.Serializable { @ApiModelProperty(notes="是否进行预算控制",allowEmptyValue=true,example="",allowableValues="") String budgetCtrl; + + @ApiModelProperty(notes="部门编号",allowEmptyValue=true,example="",allowableValues="") + String deptid; + + @ApiModelProperty(notes="是否对外公开0否1是",allowEmptyValue=true,example="",allowableValues="") + String showOut; /**项目编号**/ public XmProject(String id) { @@ -390,6 +395,18 @@ public class XmProject implements java.io.Serializable { public void setBudgetCtrl(String budgetCtrl) { this.budgetCtrl = budgetCtrl; } + /** + * 部门编号 + **/ + public void setDeptid(String deptid) { + this.deptid = deptid; + } + /** + * 是否对外公开0否1是 + **/ + public void setShowOut(String showOut) { + this.showOut = showOut; + } /** * 项目编号 @@ -631,5 +648,17 @@ public class XmProject implements java.io.Serializable { public String getBudgetCtrl() { return this.budgetCtrl; } + /** + * 部门编号 + **/ + public String getDeptid() { + return this.deptid; + } + /** + * 是否对外公开0否1是 + **/ + public String getShowOut() { + return this.showOut; + } } \ 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 2f51742a..e92b98c8 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;
+ * 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;
+ * 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;
*/ @@ -148,6 +148,12 @@ public class XmProjectPhase implements java.io.Serializable { @ApiModelProperty(notes="管理者姓名",allowEmptyValue=true,example="",allowableValues="") String mngUsername; + + @ApiModelProperty(notes="是否里程碑0否1是",allowEmptyValue=true,example="",allowableValues="") + String milestone; + + @ApiModelProperty(notes="节点是否为叶子节点",allowEmptyValue=true,example="",allowableValues="") + String pleaf; /**阶段主键**/ public XmProjectPhase(String id) { @@ -416,6 +422,18 @@ public class XmProjectPhase implements java.io.Serializable { public void setMngUsername(String mngUsername) { this.mngUsername = mngUsername; } + /** + * 是否里程碑0否1是 + **/ + public void setMilestone(String milestone) { + this.milestone = milestone; + } + /** + * 节点是否为叶子节点 + **/ + public void setPleaf(String pleaf) { + this.pleaf = pleaf; + } /** * 阶段主键 @@ -675,5 +693,17 @@ public class XmProjectPhase implements java.io.Serializable { public String getMngUsername() { return this.mngUsername; } + /** + * 是否里程碑0否1是 + **/ + public String getMilestone() { + return this.milestone; + } + /** + * 节点是否为叶子节点 + **/ + public String getPleaf() { + return this.pleaf; + } } \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml index f1e823d6..6a494a83 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml @@ -8,27 +8,27 @@ - {call load_tasks_to_xm_iteration_state(#{inIterationId,mode=IN})} + {call load_tasks_to_xm_iteration_state(#{inIterationId,mode=IN})} - + insert into XM.xm_iteration( ) values ( - #{id},#{branchId},#{iterationName},#{startTime},#{endTime},#{onlineTime},#{pid},#{adminUserid},#{adminUsername},#{ctime},#{budgetCost},#{budgetWorkload},#{seqNo},#{istatus},#{cuserid},#{cusername},#{remark} + #{id},#{branchId},#{iterationName},#{startTime},#{endTime},#{onlineTime},#{pid},#{adminUserid},#{adminUsername},#{ctime},#{budgetCost},#{budgetWorkload},#{seqNo},#{istatus},#{cuserid},#{cusername},#{remark},#{iphase} ) - delete from XM.xm_iteration res + delete from XM.xm_iteration - + 1=2 @@ -161,30 +161,33 @@ delete from XM.xm_iteration - where id in - - #{item.id } - + where + (id) + in + + ( #{item.id} + ) + - id,branch_id,iteration_name,start_time,end_time,online_time,pid,admin_userid,admin_username,ctime,budget_cost,budget_workload,seq_no,istatus,cuserid,cusername,remark + id,branch_id,iteration_name,start_time,end_time,online_time,pid,admin_userid,admin_username,ctime,budget_cost,budget_workload,seq_no,istatus,cuserid,cusername,remark,iphase - + and res.id = #{id} and res.branch_id = #{branchId} and res.iteration_name = #{iterationName} - and TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD') - and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD') - and TO_CHAR(res.online_time,'YYYY-MM-DD') = TO_CHAR(#{onlineTime},'YYYY-MM-DD') + and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d') + and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') + and date_format(res.online_time,'%Y-%m-%d') = date_format(#{onlineTime},'%Y-%m-%d') and res.pid = #{pid} and res.admin_userid = #{adminUserid} and res.admin_username = #{adminUsername} - and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD') + and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') and res.budget_cost = #{budgetCost} and res.budget_workload = #{budgetWorkload} and res.seq_no = #{seqNo} @@ -192,6 +195,7 @@ and res.cuserid = #{cuserid} and res.cusername = #{cusername} and res.remark = #{remark} + and res.iphase = #{iphase} @@ -210,7 +214,8 @@ istatus = #{istatus}, cuserid = #{cuserid}, cusername = #{cusername}, - remark = #{remark} + remark = #{remark}, + iphase = #{iphase} branch_id = #{branchId}, @@ -229,6 +234,7 @@ cuserid = #{cuserid}, cusername = #{cusername}, remark = #{remark}, + iphase = #{iphase}, @@ -247,6 +253,7 @@ istatus = #{item.istatus}, cuserid = #{item.cuserid}, cusername = #{item.cusername}, - remark = #{item.remark} + remark = #{item.remark}, + iphase = #{item.iphase} \ 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 12ea5af3..3ace103c 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 @@ -15,17 +15,17 @@ and im.menu_id = res.menu_id ) + + @@ -149,15 +148,15 @@ insert into XM.xm_menu( ) values ( - #{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername} + #{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime} ) - delete from XM.xm_menu res + delete from XM.xm_menu - + 1=2 @@ -202,18 +201,21 @@ delete from XM.xm_menu - where menu_id in - - #{item.menuId } - + where + (menu_id) + in + + ( #{item.menuId} + ) + - 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 + 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 - + and res.menu_id = #{menuId} @@ -232,6 +234,7 @@ and res.seq_no = #{seqNo} and res.mm_userid = #{mmUserid} and res.mm_username = #{mmUsername} + and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') @@ -249,7 +252,8 @@ oper_doc_url = #{operDocUrl}, seq_no = #{seqNo}, mm_userid = #{mmUserid}, - mm_username = #{mmUsername} + mm_username = #{mmUsername}, + ctime = #{ctime} menu_name = #{menuName}, @@ -267,6 +271,7 @@ seq_no = #{seqNo}, mm_userid = #{mmUserid}, mm_username = #{mmUsername}, + ctime = #{ctime}, @@ -284,6 +289,7 @@ oper_doc_url = #{item.operDocUrl}, seq_no = #{item.seqNo}, mm_userid = #{item.mmUserid}, - mm_username = #{item.mmUsername} + mm_username = #{item.mmUsername}, + ctime = #{item.ctime} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml index d87472ca..60f1a151 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml @@ -8,12 +8,12 @@ - + insert into XM.xm_product( ) values ( - #{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime} + #{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid} ) - delete from XM.xm_product res + delete from XM.xm_product - + 1=2 @@ -142,18 +142,21 @@ delete from XM.xm_product - where id in - - #{item.id } - + where + (id) + in + + ( #{item.id} + ) + - id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime + id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid - + and res.id = #{id} @@ -163,7 +166,8 @@ and res.version = #{version} and res.pm_userid = #{pmUserid} and res.pm_username = #{pmUsername} - and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD') + and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') + and res.deptid = #{deptid} @@ -173,7 +177,8 @@ version = #{version}, pm_userid = #{pmUserid}, pm_username = #{pmUsername}, - ctime = #{ctime} + ctime = #{ctime}, + deptid = #{deptid} product_name = #{productName}, @@ -183,6 +188,7 @@ pm_userid = #{pmUserid}, pm_username = #{pmUsername}, ctime = #{ctime}, + deptid = #{deptid}, @@ -192,6 +198,7 @@ version = #{item.version}, pm_userid = #{item.pmUserid}, pm_username = #{item.pmUsername}, - ctime = #{item.ctime} + ctime = #{item.ctime}, + deptid = #{item.deptid} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml index 8fa86b9d..282b2875 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml @@ -4,7 +4,7 @@ - + - + - update XM.xm_project b ,XM.xm_project_process_approva pa + update XM.xm_project b ,XM.xm_project_process_approva pa pa.agree = #{agree}, pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, + pa.assignee = #{assignee}, + pa.assignee_name = #{assigneeName}, pa.task_name = #{taskName}, pa.comment_msg = #{commentMsg}, pa.flow_last_time = now(), @@ -35,22 +35,22 @@ b.biz_proc_inst_id=#{bizProcInstId}, where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.project_id - - + and b.id=pa.project_id + + update XM.xm_project_process_approva pa set pa.flow_state='2' where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - - + + - delete from XM.xm_project + delete from XM.xm_project where biz_proc_inst_id=#{procInstId} - + @@ -63,10 +63,10 @@ s.total_progress,s.total_active_bug_cnt,s.total_confirmed_bug_cnt,s.project_status,s.total_act_workload,s.total_act_out_workload,s.total_act_inner_workload, s.total_task_budget_cost_at,s.total_task_out_cnt,s.total_need_pay_cnt,s.total_finish_pay_cnt,s.total_finish_pay_user_cnt,s.total_need_pay_user_cnt,s.total_plan_inner_user_workload, s.total_plan_out_user_workload,s.test_cases,s.exec_cases,s.design_cases,s.finish_cases,s.iteration_cnt,s.product_cnt,s.menu_cnt, - 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.xm_project res - left join XM.xm_project_state s on s.project_id=res.id - left join XM.xm_project_process_approva pa on res.id=pa.project_id and res.biz_proc_inst_id=pa.proc_inst_id - + 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.xm_project res + left join XM.xm_project_state s on s.project_id=res.id + left join XM.xm_project_process_approva pa on res.id=pa.project_id and res.biz_proc_inst_id=pa.proc_inst_id + and id in @@ -74,9 +74,6 @@ #{item} - - and res.create_time > #{createTimeStart} - and res.create_time < #{createTimeEnd} @@ -92,31 +89,31 @@ - and ( exists ( select 1 from XM.xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id ) + and ( exists ( select 1 from XM.xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id ) or res.create_userid=#{compete} or exists ( select 1 from XM.xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} ) ) - + - and exists ( select 1 from XM.xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id + and exists ( select 1 from XM.xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id and g.pg_type_id in - + #{item} - - ) + + ) - + - and exists ( select 1 from XM.xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{userid} + and exists ( select 1 from XM.xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{userid} and exe.status=#{myExecuserStatus} ) - + - and exists ( select 1 from XM.xm_my_focus f where f.userid=#{userid} and f.project_id=res.id ) + and exists ( select 1 from XM.xm_my_focus f where f.userid=#{userid} and f.project_id=res.id ) and exists ( select 1 from XM.xm_task t left join XM.xm_menu m on t.menu_id=m.menu_id and m.product_id=#{productId} @@ -162,19 +159,19 @@ - + insert into XM.xm_project( ) values ( - #{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{fromTplId},#{budgetCtrl} + #{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut} ) - delete from XM.xm_project res + delete from XM.xm_project - + 1=2 @@ -219,32 +216,35 @@ delete from XM.xm_project - where id in - - #{item.id } - + where + (id) + in + + ( #{item.id} + ) + - id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl + id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out - + and res.id = #{id} and res.code = #{code} and res.name = #{name} and res.xm_type = #{xmType} - and TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD') - and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD') + and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d') + and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') and res.urgent = #{urgent} and res.priority = #{priority} and res.description = #{description} and res.create_userid = #{createUserid} and res.create_username = #{createUsername} - and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD') + and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') and res.assess = #{assess} and res.assess_remarks = #{assessRemarks} and res.status = #{status} @@ -256,7 +256,7 @@ and res.plan_inner_user_at = #{planInnerUserAt} and res.plan_out_user_at = #{planOutUserAt} and res.locked = #{locked} - and TO_CHAR(res.base_time,'YYYY-MM-DD') = TO_CHAR(#{baseTime},'YYYY-MM-DD') + and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d') and res.base_remark = #{baseRemark} and res.baseline_id = #{baselineId} and res.plan_workload = #{planWorkload} @@ -273,6 +273,8 @@ and res.plan_out_user_workload = #{planOutUserWorkload} and res.from_tpl_id = #{fromTplId} and res.budget_ctrl = #{budgetCtrl} + and res.deptid = #{deptid} + and res.show_out = #{showOut} @@ -314,7 +316,9 @@ plan_inner_user_workload = #{planInnerUserWorkload}, plan_out_user_workload = #{planOutUserWorkload}, from_tpl_id = #{fromTplId}, - budget_ctrl = #{budgetCtrl} + budget_ctrl = #{budgetCtrl}, + deptid = #{deptid}, + show_out = #{showOut} code = #{code}, @@ -356,6 +360,8 @@ plan_out_user_workload = #{planOutUserWorkload}, from_tpl_id = #{fromTplId}, budget_ctrl = #{budgetCtrl}, + deptid = #{deptid}, + show_out = #{showOut}, @@ -397,6 +403,8 @@ plan_inner_user_workload = #{item.planInnerUserWorkload}, plan_out_user_workload = #{item.planOutUserWorkload}, from_tpl_id = #{item.fromTplId}, - budget_ctrl = #{item.budgetCtrl} + budget_ctrl = #{item.budgetCtrl}, + deptid = #{item.deptid}, + show_out = #{item.showOut} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml index 49e9e8ef..8d2af08c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml @@ -103,7 +103,7 @@ insert into XM.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} + #{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} ) @@ -168,7 +168,7 @@ - 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 + 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 @@ -216,6 +216,8 @@ and res.task_budget_at = #{taskBudgetAt} and res.mng_userid = #{mngUserid} and res.mng_username = #{mngUsername} + and res.milestone = #{milestone} + and res.pleaf = #{pleaf} @@ -260,7 +262,9 @@ task_budget_workload = #{taskBudgetWorkload}, task_budget_at = #{taskBudgetAt}, mng_userid = #{mngUserid}, - mng_username = #{mngUsername} + mng_username = #{mngUsername}, + milestone = #{milestone}, + pleaf = #{pleaf} phase_name = #{phaseName}, @@ -305,6 +309,8 @@ task_budget_at = #{taskBudgetAt}, mng_userid = #{mngUserid}, mng_username = #{mngUsername}, + milestone = #{milestone}, + pleaf = #{pleaf}, @@ -349,6 +355,8 @@ task_budget_workload = #{item.taskBudgetWorkload}, task_budget_at = #{item.taskBudgetAt}, mng_userid = #{item.mngUserid}, - mng_username = #{item.mngUsername} + mng_username = #{item.mngUsername}, + milestone = #{item.milestone}, + pleaf = #{item.pleaf} \ No newline at end of file