添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@@ -67,6 +67,7 @@ public class XmMenuController {
 	public Map<String,Object> listXmMenu( @RequestParam Map<String,Object> xmMenu){
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmMenu, "menuIds");
+		RequestUtils.transformArray(xmMenu, "tagIdList");
 		PageUtils.startPage(xmMenu);
 		String menuId= (String) xmMenu.get("menuId");
 		Object menuIds=  xmMenu.get("menuIds");
@@ -96,6 +97,7 @@ public class XmMenuController {
 	public Map<String,Object> listWithState( @RequestParam Map<String,Object> xmMenu){
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmMenu, "menuIds");
+		RequestUtils.transformArray(xmMenu, "tagIdList");
 		PageUtils.startPage(xmMenu);
 		Tips tips=new Tips("查询成功");
 		String menuId= (String) xmMenu.get("menuId");
@@ -123,6 +125,7 @@ public class XmMenuController {
 	public Map<String,Object> listWithPlan( @RequestParam Map<String,Object> xmMenu){
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmMenu, "menuIds");
+		RequestUtils.transformArray(xmMenu, "tagIdList");
 		PageUtils.startPage(xmMenu);
 		Tips tips=new Tips("查询成功");
 		if(StringUtils.isEmpty(xmMenu.get("projectId"))) {

xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java

@@ -104,6 +104,7 @@ public class XmMenuPlanController {
 	public Map<String,Object> listXmMenuPlan( @RequestParam Map<String,Object> xmMenuPlan){
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmMenuPlan, "ids");
+		RequestUtils.transformArray(xmMenuPlan, "tagIdList");
 		PageUtils.startPage(xmMenuPlan);
 		List<Map<String,Object>>	xmMenuPlanList = xmMenuPlanService.selectListMapByWhere(xmMenuPlan);	//列出XmMenuPlan列表
 		PageUtils.responePage(m, xmMenuPlanList);

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java

@@ -100,6 +100,7 @@ public class XmQuestionController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmQuestion, "ids");
 		RequestUtils.transformArray(xmQuestion, "menuIds");
+		RequestUtils.transformArray(xmQuestion, "tagIdList");
 		PageUtils.startPage(xmQuestion);
 		User user = LoginUtils.getCurrentUserInfo();
 		xmQuestion.put("compete",user.getUserid());

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -361,6 +361,7 @@ public class XmTaskController {
 	public Map<String,Object> listXmTask( @RequestParam Map<String,Object> xmTask){
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmTask, "ids");
+		RequestUtils.transformArray(xmTask, "tagIdList");
 		PageUtils.startPage(xmTask);
 
 		String taskOut= (String) xmTask.get("taskOut");

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml

@@ -11,6 +11,11 @@
 				( #{item})
 			</foreach>
 		</if>
+		<if test=" tagIdList != null"> and
+			<foreach collection="tagIdList" item="item" index="index" open="(" separator=" or " close=")" >
+				find_in_set(item,res.tag_ids)
+			</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)

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml

@@ -67,6 +67,11 @@
 				        #{item}  
 				    </foreach>  
 			 </if>
+			<if test=" tagIdList != null"> and
+				<foreach collection="tagIdList" item="item" index="index" open="(" separator=" or " close=")" >
+					find_in_set(item,res.tag_ids)
+				</foreach>
+			</if>
 			<if test="hisHandlerUserid !=null "> and exists (select 1 from xm_question_handle h where h.question_id = res.id and h.handler_userid=#{hisHandlerUserid} and handle_status=#{hisHandleStatus})</if>
 			<if test=" createTimeStart !=null "> and res.create_time between #{createTimeStart} and #{createTimeEnd} </if>
 			<if test=" ltimeStart !=null "> and res.ltime between #{ltimeStart} and #{ltimeEnd} </if>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@@ -10,7 +10,14 @@
              <foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
                  ( #{item})
              </foreach>
-         </if><if test=" createTimeStart !=null "> and res.create_time &gt; #{createTimeStart} </if>
+         </if>
+
+		<if test=" tagIdList != null"> and
+			<foreach collection="tagIdList" item="item" index="index" open="(" separator=" or " close=")" >
+				find_in_set(item,res.tag_ids)
+			</foreach>
+		</if>
+		<if test=" createTimeStart !=null "> and res.create_time &gt; #{createTimeStart} </if>
 		<if test=" createTimeEnd !=null "> and res.create_time &lt; #{createTimeEnd} </if>
 		<include refid="where"/>
 		<if test="parent != null and parent != ''"> and (res.parent_taskid = '' or res.parent_taskid IS NULL)</if>