From 063b7f1b2c4da837a4f3b34bdfdaa80da4382d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 28 Mar 2022 09:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/entity/XmMenu.java | 40 ++++++++++++++++--- .../mapper/xm/core/dao/XmMenuMapper.xml | 16 ++++++-- 2 files changed, 47 insertions(+), 9 deletions(-) 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 6d2f250a..780bc1d6 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 @@ -8,9 +8,9 @@ import java.math.BigDecimal; /** * 组织 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,tagIds,tagNames,pidPaths,lvl,isTpl,budgetHours,budgetStaffNu,budgetWorkload,budgetAmount,phaseId,iterationId,calcType,mactWorkload,mactAmount,mactRate,source,proposerId,proposerName,dlvl,dtype,priority,dclass,iterationName;
+ * startTime,menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl,isTpl,budgetHours,budgetStaffNu,budgetWorkload,budgetAmount,phaseId,iterationId,calcType,mactWorkload,mactAmount,mactRate,source,proposerId,proposerName,dlvl,dtype,priority,dclass,iterationName,endTime;
* 表 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,tag_ids,tag_names,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type,mact_workload,mact_amount,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name;
+ * start_time,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,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type,mact_workload,mact_amount,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time;
* 当前主键(包括多主键):
* menu_id;
*/ @@ -23,6 +23,9 @@ public class XmMenu implements java.io.Serializable { String menuId; + @ApiModelProperty(notes="开始时间",allowEmptyValue=true,example="",allowableValues="") + Date startTime; + @ApiModelProperty(notes="功能名称",allowEmptyValue=true,example="",allowableValues="") String menuName; @@ -116,7 +119,7 @@ public class XmMenu implements java.io.Serializable { @ApiModelProperty(notes="迭代编号",allowEmptyValue=true,example="",allowableValues="") String iterationId; - @ApiModelProperty(notes="叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报，3-下往上",allowEmptyValue=true,example="",allowableValues="") String calcType; @ApiModelProperty(notes="手工填报的情况下填报的工作量，其余为下级往上汇总数据",allowEmptyValue=true,example="",allowableValues="") @@ -151,6 +154,9 @@ public class XmMenu implements java.io.Serializable { @ApiModelProperty(notes="迭代名称",allowEmptyValue=true,example="",allowableValues="") String iterationName; + + @ApiModelProperty(notes="结束时间",allowEmptyValue=true,example="",allowableValues="") + Date endTime; /**功能编号**/ public XmMenu(String menuId) { @@ -161,6 +167,12 @@ public class XmMenu implements java.io.Serializable { public XmMenu() { } + /** + * 开始时间 + **/ + public void setStartTime(Date startTime) { + this.startTime = startTime; + } /** * 功能编号 **/ @@ -354,7 +366,7 @@ public class XmMenu implements java.io.Serializable { this.iterationId = iterationId; } /** - * 叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报 + * 叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报，3-下往上 **/ public void setCalcType(String calcType) { this.calcType = calcType; @@ -425,7 +437,19 @@ public class XmMenu implements java.io.Serializable { public void setIterationName(String iterationName) { this.iterationName = iterationName; } + /** + * 结束时间 + **/ + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + /** + * 开始时间 + **/ + public Date getStartTime() { + return this.startTime; + } /** * 功能编号 **/ @@ -619,7 +643,7 @@ public class XmMenu implements java.io.Serializable { return this.iterationId; } /** - * 叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报 + * 叶子节点数据收集方式0-不计算，1-由任务汇总，2-手工填报，3-下往上 **/ public String getCalcType() { return this.calcType; @@ -690,5 +714,11 @@ public class XmMenu implements java.io.Serializable { public String getIterationName() { return this.iterationName; } + /** + * 结束时间 + **/ + public Date getEndTime() { + return this.endTime; + } } \ 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 4f1a0655..7baed9c3 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 @@ -236,7 +236,7 @@ insert into xm_menu( ) values ( - #{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime},#{ntype},#{sinceVersion},#{childrenCnt},#{ltime},#{tagIds},#{tagNames},#{pidPaths},#{lvl},#{isTpl},#{budgetHours},#{budgetStaffNu},#{budgetWorkload},#{budgetAmount},#{phaseId},#{iterationId},#{calcType},#{mactWorkload},#{mactAmount},#{mactRate},#{source},#{proposerId},#{proposerName},#{dlvl},#{dtype},#{priority},#{dclass},#{iterationName} + #{startTime},#{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime},#{ntype},#{sinceVersion},#{childrenCnt},#{ltime},#{tagIds},#{tagNames},#{pidPaths},#{lvl},#{isTpl},#{budgetHours},#{budgetStaffNu},#{budgetWorkload},#{budgetAmount},#{phaseId},#{iterationId},#{calcType},#{mactWorkload},#{mactAmount},#{mactRate},#{source},#{proposerId},#{proposerName},#{dlvl},#{dtype},#{priority},#{dclass},#{iterationName},#{endTime} ) @@ -299,11 +299,12 @@ - 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,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type,mact_workload,mact_amount,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name + start_time,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,pid_paths,lvl,is_tpl,budget_hours,budget_staff_nu,budget_workload,budget_amount,phase_id,iteration_id,calc_type,mact_workload,mact_amount,mact_rate,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time + and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d') and res.menu_id = #{menuId} and res.menu_name = #{menuName} and res.pmenu_id = #{pmenuId} @@ -348,9 +349,11 @@ and res.priority = #{priority} and res.dclass = #{dclass} and res.iteration_name = #{iterationName} + and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') + start_time = #{startTime}, menu_name = #{menuName}, pmenu_id = #{pmenuId}, product_id = #{productId}, @@ -393,9 +396,11 @@ dtype = #{dtype}, priority = #{priority}, dclass = #{dclass}, - iteration_name = #{iterationName} + iteration_name = #{iterationName}, + end_time = #{endTime} + start_time = #{startTime}, menu_name = #{menuName}, pmenu_id = #{pmenuId}, product_id = #{productId}, @@ -439,9 +444,11 @@ priority = #{priority}, dclass = #{dclass}, iteration_name = #{iterationName}, + end_time = #{endTime}, + start_time = #{item.startTime}, menu_name = #{item.menuName}, pmenu_id = #{item.pmenuId}, product_id = #{item.productId}, @@ -484,6 +491,7 @@ dtype = #{item.dtype}, priority = #{item.priority}, dclass = #{item.dclass}, - iteration_name = #{item.iterationName} + iteration_name = #{item.iterationName}, + end_time = #{item.endTime} \ No newline at end of file