From 4ef7cfc62c630e297e66d742db4d32a8228f72f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 22 Mar 2022 19:45:22 +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  | 25 +++++++++++++++----
 .../mapper/xm/core/dao/XmMenuMapper.xml       | 21 ++++++++++++----
 2 files changed, 36 insertions(+), 10 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 b32c5f8b..83120a74 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  小模块 <br> 
  * 实体 XmMenu所有属性名: <br>
- *	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;<br>
+ *	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;<br>
  * 表 xm_menu 功能表的所有字段名: <br>
- *	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;<br>
+ *	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;<br>
  * 当前主键(包括多主键):<br>
  *	menu_id;<br>
  */
@@ -71,7 +71,7 @@ public class XmMenu  implements java.io.Serializable {
 	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
 	Date ctime;
 	
-	@ApiModelProperty(notes="节点类型0-需求，1-需求池。需求池下建需求或者需求池，需求下不允许建立任何子节点",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="节点类型0-叶子节点，1非叶子节点",allowEmptyValue=true,example="",allowableValues="")
 	String ntype;
 	
 	@ApiModelProperty(notes="开始版本",allowEmptyValue=true,example="",allowableValues="")
@@ -145,6 +145,9 @@ public class XmMenu  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="优先级;0-紧急重要；1-紧急不重要；2-不紧急重要；3-不紧急不重要",allowEmptyValue=true,example="",allowableValues="")
 	String priority;
+	
+	@ApiModelProperty(notes="需求分类1-史诗，2-特性，3-用户故事，4-任务，5-缺陷",allowEmptyValue=true,example="",allowableValues="")
+	String dclass;
 
 	/**功能编号**/
 	public XmMenu(String menuId) {
@@ -258,7 +261,7 @@ public class XmMenu  implements java.io.Serializable {
 		this.ctime = ctime;
 	}
 	/**
-	 * 节点类型0-需求，1-需求池。需求池下建需求或者需求池，需求下不允许建立任何子节点
+	 * 节点类型0-叶子节点，1非叶子节点
 	 **/
 	public void setNtype(String ntype) {
 		this.ntype = ntype;
@@ -407,6 +410,12 @@ public class XmMenu  implements java.io.Serializable {
 	public void setPriority(String priority) {
 		this.priority = priority;
 	}
+	/**
+	 * 需求分类1-史诗，2-特性，3-用户故事，4-任务，5-缺陷
+	 **/
+	public void setDclass(String dclass) {
+		this.dclass = dclass;
+	}
 	
 	/**
 	 * 功能编号
@@ -511,7 +520,7 @@ public class XmMenu  implements java.io.Serializable {
 		return this.ctime;
 	}
 	/**
-	 * 节点类型0-需求，1-需求池。需求池下建需求或者需求池，需求下不允许建立任何子节点
+	 * 节点类型0-叶子节点，1非叶子节点
 	 **/
 	public String getNtype() {
 		return this.ntype;
@@ -660,5 +669,11 @@ public class XmMenu  implements java.io.Serializable {
 	public String getPriority() {
 		return this.priority;
 	}
+	/**
+	 * 需求分类1-史诗，2-特性，3-用户故事，4-任务，5-缺陷
+	 **/
+	public String getDclass() {
+		return this.dclass;
+	}
 
 }
\ 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 d4a441d0..8c1715df 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
@@ -185,7 +185,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select (select sum(1) from xm_menu m where m.pmenu_id=res.menu_id ) as children_cnt,res.*,i.iteration_name from xm_menu res left join xm_iteration i on res.iteration_id=i.id
+		select * from xm_menu res
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>
@@ -206,6 +206,13 @@
 		where 
 			res.menu_id = #{menuId}
 	</select>
+    <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmMenu">
+        select * from xm_menu res
+        where  (res.menu_id) in
+             <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+    </select>
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_menu res
@@ -224,7 +231,7 @@
 		insert into xm_menu(
 			<include refid="columns"/>
 		) 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}
+		#{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}
 		)
 	</insert>
 	
@@ -287,7 +294,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		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
+		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
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -334,6 +341,7 @@
 		<if test="dlvl != null and dlvl != ''">      and res.dlvl = #{dlvl}     </if>
 		<if test="dtype != null and dtype != ''">      and res.dtype = #{dtype}     </if>
 		<if test="priority != null and priority != ''">      and res.priority = #{priority}     </if>
+		<if test="dclass != null and dclass != ''">      and res.dclass = #{dclass}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -377,7 +385,8 @@
 		proposer_name = #{proposerName},
 		dlvl = #{dlvl},
 		dtype = #{dtype},
-		priority = #{priority}
+		priority = #{priority},
+		dclass = #{dclass}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="menuName != null and menuName != ''"> menu_name = #{menuName},     </if>
@@ -421,6 +430,7 @@
 		<if test="dlvl != null and dlvl != ''"> dlvl = #{dlvl},     </if>
 		<if test="dtype != null and dtype != ''"> dtype = #{dtype},     </if>
 		<if test="priority != null and priority != ''"> priority = #{priority},     </if>
+		<if test="dclass != null and dclass != ''"> dclass = #{dclass},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -464,6 +474,7 @@
 			proposer_name = #{item.proposerName},
 			dlvl = #{item.dlvl},
 			dtype = #{item.dtype},
-			priority = #{item.priority}
+			priority = #{item.priority},
+			dclass = #{item.dclass}
 	</sql>
 </mapper>
\ No newline at end of file