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 6a2c664b..32fa50b8 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;
+ * 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;
* 表 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;
+ * 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;
* 当前主键(包括多主键):
* menu_id;
*/
@@ -112,6 +112,9 @@ public class XmMenu implements java.io.Serializable {
@ApiModelProperty(notes="计划编号",allowEmptyValue=true,example="",allowableValues="")
String phaseId;
+
+ @ApiModelProperty(notes="迭代编号",allowEmptyValue=true,example="",allowableValues="")
+ String iterationId;
/**功能编号**/
public XmMenu(String menuId) {
@@ -308,6 +311,12 @@ public class XmMenu implements java.io.Serializable {
public void setPhaseId(String phaseId) {
this.phaseId = phaseId;
}
+ /**
+ * 迭代编号
+ **/
+ public void setIterationId(String iterationId) {
+ this.iterationId = iterationId;
+ }
/**
* 功能编号
@@ -495,5 +504,11 @@ public class XmMenu implements java.io.Serializable {
public String getPhaseId() {
return this.phaseId;
}
+ /**
+ * 迭代编号
+ **/
+ public String getIterationId() {
+ return this.iterationId;
+ }
}
\ 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 d66cb977..e63244d9 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
@@ -162,7 +162,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}
+ #{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}
)
@@ -225,7 +225,7 @@
- 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
+ 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
@@ -261,6 +261,7 @@
and res.budget_workload = #{budgetWorkload}
and res.budget_amount = #{budgetAmount}
and res.phase_id = #{phaseId}
+ and res.iteration_id = #{iterationId}
@@ -293,7 +294,8 @@
budget_staff_nu = #{budgetStaffNu},
budget_workload = #{budgetWorkload},
budget_amount = #{budgetAmount},
- phase_id = #{phaseId}
+ phase_id = #{phaseId},
+ iteration_id = #{iterationId}
menu_name = #{menuName},
@@ -326,6 +328,7 @@
budget_workload = #{budgetWorkload},
budget_amount = #{budgetAmount},
phase_id = #{phaseId},
+ iteration_id = #{iterationId},
@@ -358,6 +361,7 @@
budget_staff_nu = #{item.budgetStaffNu},
budget_workload = #{item.budgetWorkload},
budget_amount = #{item.budgetAmount},
- phase_id = #{item.phaseId}
+ phase_id = #{item.phaseId},
+ iteration_id = #{item.iterationId}
\ No newline at end of file