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 小模块
* 实体 XmMenu所有属性名:
- * 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,ctime;
+ * menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime;
+ * 表 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;
* 当前主键(包括多主键):
* menu_id;
*/
@@ -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 @@
-
-
+
+
+
+ and (res.menu_id) in
+
+ ( #{item})
+
+
+
+ and not
+ exists ( select 1 from xm_iteration_menu im where im.menu_id=res.menu_id)
+
+
+ and not
+ exists ( select 1 from xm_task t where t.menu_id=res.menu_id)
+
+ and res.menu_name like #{key}
+
-
+
+
@@ -97,23 +114,9 @@
@@ -146,31 +149,31 @@
-
+
insert into xm_menu(
) 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}
)
- delete from xm_menu
+ delete from xm_menu res
- 1=2
+
- delete from xm_menu
+ delete from xm_menu
where menu_id = #{menuId}
- update xm_menu
+ update xm_menu
@@ -179,7 +182,7 @@
- update xm_menu
+ update xm_menu
@@ -194,7 +197,7 @@
- update xm_menu
+ update xm_menu
set
where menu_id = #{item.menuId}
@@ -202,20 +205,18 @@
- delete from xm_menu
+ delete from xm_menu
where
- (menu_id)
- in
+ (menu_id) in
- ( #{item.menuId}
- )
+ ( #{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,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
@@ -237,6 +238,10 @@
and res.mm_userid = #{mmUserid}
and res.mm_username = #{mmUsername}
and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')
+ and res.ntype = #{ntype}
+ and res.since_version = #{sinceVersion}
+ and res.children_cnt = #{childrenCnt}
+ and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')
@@ -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}
menu_name = #{menuName},
@@ -274,6 +283,10 @@
mm_userid = #{mmUserid},
mm_username = #{mmUsername},
ctime = #{ctime},
+ ntype = #{ntype},
+ since_version = #{sinceVersion},
+ children_cnt = #{childrenCnt},
+ ltime = #{ltime},
@@ -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}
\ No newline at end of file