From 1210df4e1990000cae09f59e1fc0289bfb8c0767 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, 15 Feb 2022 20:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=97=B6=E9=97=B4=E7=9A=84=E5=8D=95=E7=8B=AC=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xm/core/entity/XmMenu.java  |  66 +++++++++-
 .../mapper/xm/core/dao/XmMenuMapper.xml       | 121 ++++++++++--------
 2 files changed, 132 insertions(+), 55 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 55175fb9..7f63fa31 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
@@ -7,9 +7,9 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmMenu所有属性名: <br>
- *	menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime;<br>
- * 表 XM.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;<br>
+ *	menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime;<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;<br>
  * 当前主键(包括多主键):<br>
  *	menu_id;<br>
  */
@@ -69,6 +69,18 @@ public class XmMenu  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
 	Date ctime;
+	
+	@ApiModelProperty(notes="节点类型0-功能点，1-目录。目录下建功能点，功能点下不允许建立任何子节点",allowEmptyValue=true,example="",allowableValues="")
+	String ntype;
+	
+	@ApiModelProperty(notes="开始版本",allowEmptyValue=true,example="",allowableValues="")
+	String sinceVersion;
+	
+	@ApiModelProperty(notes="儿子节点个数",allowEmptyValue=true,example="",allowableValues="")
+	Integer childrenCnt;
+	
+	@ApiModelProperty(notes="更新时间",allowEmptyValue=true,example="",allowableValues="")
+	Date ltime;
 
 	/**功能编号**/
 	public XmMenu(String menuId) {
@@ -181,6 +193,30 @@ public class XmMenu  implements java.io.Serializable {
 	public void setCtime(Date ctime) {
 		this.ctime = ctime;
 	}
+	/**
+	 * 节点类型0-功能点，1-目录。目录下建功能点，功能点下不允许建立任何子节点
+	 **/
+	public void setNtype(String ntype) {
+		this.ntype = ntype;
+	}
+	/**
+	 * 开始版本
+	 **/
+	public void setSinceVersion(String sinceVersion) {
+		this.sinceVersion = sinceVersion;
+	}
+	/**
+	 * 儿子节点个数
+	 **/
+	public void setChildrenCnt(Integer childrenCnt) {
+		this.childrenCnt = childrenCnt;
+	}
+	/**
+	 * 更新时间
+	 **/
+	public void setLtime(Date ltime) {
+		this.ltime = ltime;
+	}
 	
 	/**
 	 * 功能编号
@@ -284,5 +320,29 @@ public class XmMenu  implements java.io.Serializable {
 	public Date getCtime() {
 		return this.ctime;
 	}
+	/**
+	 * 节点类型0-功能点，1-目录。目录下建功能点，功能点下不允许建立任何子节点
+	 **/
+	public String getNtype() {
+		return this.ntype;
+	}
+	/**
+	 * 开始版本
+	 **/
+	public String getSinceVersion() {
+		return this.sinceVersion;
+	}
+	/**
+	 * 儿子节点个数
+	 **/
+	public Integer getChildrenCnt() {
+		return this.childrenCnt;
+	}
+	/**
+	 * 更新时间
+	 **/
+	public Date getLtime() {
+		return this.ltime;
+	}
 
 }
\ 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 b18659d1..fb2e3b63 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
@@ -3,34 +3,50 @@
 <mapper namespace="com.xm.core.entity.XmMenu">
 	
 	
-	<!--开始 自定sql函数区域 -->
-		<!--请在此区域添加自定义函数-->
+	<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
+
+    <sql id="whereForMap">
+         <if test=" menuIds != null">  and (res.menu_id) in
+             <foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+         </if>
+		<if test=' iterationFilterType!=null and iterationFilterType!=""'>
+			and <if test='iterationFilterType=="not-join"'> not  </if>
+			exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id)
+		</if>
+		<if test=' taskFilterType!=null and taskFilterType!="" '>
+			and <if test='taskFilterType=="not-join"'> not  </if>
+			exists ( select 1 from xm_task t where  t.menu_id=res.menu_id)
+		</if>
+		<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
+    </sql>
 
 	<select id="selectExistIterationMenus" parameterType="HashMap" resultType="com.xm.core.entity.XmMenu">
 		select  * from xm_menu res
 		where exists (select 1 from xm_iteration_menu im where im.menu_id  in
-			<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
-				#{item}
-			</foreach>
-		    and im.menu_id = res.menu_id )
+		<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
+			#{item}
+		</foreach>
+		and im.menu_id = res.menu_id )
 	</select>
 	<select id="queryTaskUsersByMenuId" parameterType="HashMap" resultType="HashMap">
-		 select distinct te.userid,te.username,t.executor_userid, t.executor_username from xm_task_execuser te inner join xm_task t on t.id=te.task_id
-		 where t.menu_id=#{menuId} and te.status !='8' and te.status !='7'
+		select distinct te.userid,te.username,t.executor_userid, t.executor_username from xm_task_execuser te inner join xm_task t on t.id=te.task_id
+		where t.menu_id=#{menuId} and te.status !='8' and te.status !='7'
 	</select>
 	<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
 		select res.*,s.* from xm_menu res left join xm_menu_state s on res.menu_id=s.menu_id
 		<where>
 			<if test="ids != null">  and
 				menu_id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-				        #{item}
-				    </foreach>
-			 </if>
+				<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+					#{item}
+				</foreach>
+			</if>
 			<include refid="where"/>
 			<if test=' iterationFilterType=="join" '>
 				and exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id
-					<if test="iterationId!=null"> and im.iteration_id=#{iterationId}</if>
+				<if test="iterationId!=null"> and im.iteration_id=#{iterationId}</if>
 				)
 			</if>
 			<if test='iterationFilterType=="not-join"'>
@@ -44,9 +60,9 @@
 			<if test=' projectId !=null and projectId!="" and ( taskFilterType==null or taskFilterType=="" )'>
 				and  exists ( select 1 from xm_task t where t.menu_id =res.menu_id and t.project_id=#{projectId})
 			</if>
-			 <if test="compete !=null and compete!=''">
+			<if test="compete !=null and compete!=''">
 				and (   exists ( select 1 from xm_menu m1 where m.mm_userid=#{compete} and m.product_id=res.product_id)
-						or exists ( select 1 from xm_product p where p.pm_userid=#{compete} and res.product_id=p.id)
+				or exists ( select 1 from xm_product p where p.pm_userid=#{compete} and res.product_id=p.id)
 				)
 			</if>
 			<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
@@ -58,10 +74,10 @@
 		<where>
 			<if test="ids != null">  and
 				menu_id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
-				        #{item}
-				    </foreach>
-			 </if>
+				<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
+					#{item}
+				</foreach>
+			</if>
 			<include refid="where"/>
 			<if test=' iterationFilterType=="join" '>
 				and exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id
@@ -89,7 +105,8 @@
 
 		order by res.seq_no asc
 	</select>
-		
+
+
 	<!--结束 自定义sql函数区域-->
 	
 
@@ -97,23 +114,9 @@
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
 		select * from xm_menu res
-		<where> 
-			<if test="ids != null">  and     
-				menu_id in
-				    <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >  
-				        #{item}  
-				    </foreach>  
-			 </if>
+		<where>
+		    <include refid="whereForMap"/>
 			<include refid="where"/>
-			<if test=' iterationFilterType!=null and iterationFilterType!=""'>
-				and <if test='iterationFilterType=="not-join"'> not  </if>
-				exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id)
-			</if>
-			<if test=' taskFilterType!=null and taskFilterType!="" '>
-				and <if test='taskFilterType=="not-join"'> not  </if>
-			    exists ( select 1 from xm_task t where  t.menu_id=res.menu_id)
-			</if>
-			<if test="key != null and key !='' ">  and res.menu_name like #{key}     </if>
 		</where>
 	</select>
 	
@@ -146,31 +149,31 @@
 		</where>
 	</select>
 	<!-- 新增一条记录  主键menu_id,-->
-	<insert id="insert" parameterType="com.xm.core.entity.XmMenu" useGeneratedKeys="false" keyProperty="menu_id">
+	<insert id="insert" parameterType="com.xm.core.entity.XmMenu" useGeneratedKeys="false"   keyProperty="menu_id">
 		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}
+		#{menuId},#{menuName},#{pmenuId},#{productId},#{remark},#{status},#{online},#{demandUrl},#{codeUrl},#{designUrl},#{docUrl},#{helpUrl},#{operDocUrl},#{seqNo},#{mmUserid},#{mmUsername},#{ctime},#{ntype},#{sinceVersion},#{childrenCnt},#{ltime}
 		)
 	</insert>
 	
 	<!-- 按条件删除若干条记录-->
 	<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmMenu">
-		delete from xm_menu
+		delete from xm_menu res
 		<where>  
-			1=2
+			<include refid="where"/>
 		</where>
 	</delete>
 	
 	<!-- 按主键删除一条记录-->
 	<delete id="deleteByPk" parameterType="com.xm.core.entity.XmMenu">
-		delete from xm_menu
+		delete from xm_menu 
 		where menu_id = #{menuId} 
 	</delete>
 	
 	<!-- 根据条件修改若干条记录 -->
 	<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmMenu">
-		update  xm_menu
+		update  xm_menu 
 		<set>
 			<include refid="someFieldSet"/>
 		</set>
@@ -179,7 +182,7 @@
 	
 		<!-- 根据主键修改一条记录 -->
 	<update id="updateByPk" parameterType="com.xm.core.entity.XmMenu">
-		update  xm_menu
+		update  xm_menu 
 		<set>
 			<include refid="set"/>
 		</set>
@@ -194,7 +197,7 @@
 	<!-- 批量更新 -->
 	<update id="batchUpdate" parameterType="List">   
 		<foreach collection="list" item="item" index="index" separator=";" >
-   		update  xm_menu
+   		update  xm_menu 
 		set 
 			<include refid="batchSet"/>
 			where menu_id = #{item.menuId}  
@@ -202,20 +205,18 @@
 	</update>
 	<!-- 批量删除 -->
 	<delete id="batchDelete" parameterType="List">  
-		delete from xm_menu
+		delete from xm_menu 
 			where
-			(menu_id)
-			    in
+			(menu_id) in
                 <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
-                    ( #{item.menuId}
-                    )
+                    (  #{item.menuId} )
                 </foreach>
 	</delete>
 	
 	
 	<!--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
+		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
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -237,6 +238,10 @@
 		<if test="mmUserid != null and mmUserid != ''">      and res.mm_userid = #{mmUserid}     </if>
 		<if test="mmUsername != null and mmUsername != ''">      and res.mm_username = #{mmUsername}     </if>
 		<if test="ctime != null">      and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')     </if>
+		<if test="ntype != null and ntype != ''">      and res.ntype = #{ntype}     </if>
+		<if test="sinceVersion != null and sinceVersion != ''">      and res.since_version = #{sinceVersion}     </if>
+		<if test="childrenCnt != null and childrenCnt != ''">      and res.children_cnt = #{childrenCnt}     </if>
+		<if test="ltime != null">      and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -255,7 +260,11 @@
 		seq_no = #{seqNo},
 		mm_userid = #{mmUserid},
 		mm_username = #{mmUsername},
-		ctime = #{ctime}
+		ctime = #{ctime},
+		ntype = #{ntype},
+		since_version = #{sinceVersion},
+		children_cnt = #{childrenCnt},
+		ltime = #{ltime}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="menuName != null and menuName != ''"> menu_name = #{menuName},     </if>
@@ -274,6 +283,10 @@
 		<if test="mmUserid != null and mmUserid != ''"> mm_userid = #{mmUserid},     </if>
 		<if test="mmUsername != null and mmUsername != ''"> mm_username = #{mmUsername},     </if>
 		<if test="ctime != null"> ctime = #{ctime},     </if>
+		<if test="ntype != null and ntype != ''"> ntype = #{ntype},     </if>
+		<if test="sinceVersion != null and sinceVersion != ''"> since_version = #{sinceVersion},     </if>
+		<if test="childrenCnt != null and childrenCnt != ''"> children_cnt = #{childrenCnt},     </if>
+		<if test="ltime != null"> ltime = #{ltime},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -292,6 +305,10 @@
 			seq_no = #{item.seqNo},
 			mm_userid = #{item.mmUserid},
 			mm_username = #{item.mmUsername},
-			ctime = #{item.ctime}
+			ctime = #{item.ctime},
+			ntype = #{item.ntype},
+			since_version = #{item.sinceVersion},
+			children_cnt = #{item.childrenCnt},
+			ltime = #{item.ltime}
 	</sql>
 </mapper>
\ No newline at end of file