添加节点类型、标签等

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

@@ -210,6 +210,20 @@ public class XmMenuController {
 		return ResponseHelper.ok("成功",datas);
 	}
 
+	@RequestMapping(value="/getXmMenuSort",method=RequestMethod.GET)
+	public Map<String,Object> getXmMenuSort( @RequestParam Map<String,Object> xmMenu){
+		User user=LoginUtils.getCurrentUserInfo();
+		PageUtils.startPage(xmMenu);
+		xmMenu.put("branchId",user.getBranchId());
+		List<Map<String,Object>> datas= this.xmMenuService.getXmMenuSort(xmMenu);
+		Map<String,Object> m=new HashMap<>();
+		PageUtils.responePage(m,datas);
+		m.put("data",datas);
+		Tips tips=new Tips("查询成功");
+		m.put("tips", tips);
+		return m;
+	}
+
 	@RequestMapping(value="/listWithPhase",method=RequestMethod.GET)
 	public Map<String,Object> listWithPhase( @RequestParam Map<String,Object> xmMenu){
 		Map<String,Object> m = new HashMap<>();

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

@@ -1,6 +1,7 @@
 package com.xm.core.ctrl;
 
 import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.Page;
 import com.mdp.audit.log.client.annotation.AuditLog;
 import com.mdp.audit.log.client.annotation.OperType;
 import com.mdp.core.entity.Tips;
@@ -135,6 +136,19 @@ public class XmQuestionController {
 		return ResponseHelper.ok("成功",datas);
 	}
 
+	@RequestMapping(value="/getXmQuestionSort",method=RequestMethod.GET)
+	public Map<String,Object> getXmQuestionSort( @RequestParam Map<String,Object> xmQuestion){
+		User user=LoginUtils.getCurrentUserInfo();
+		PageUtils.startPage(xmQuestion);
+		xmQuestion.put("branchId",user.getBranchId());
+		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionSort(xmQuestion);
+		Map<String,Object> m=new HashMap<>();
+		PageUtils.responePage(m,datas);
+		m.put("data",datas);
+		Tips tips=new Tips("查询成功");
+		m.put("tips", tips);
+		return m;
+	}
 
 	@ApiOperation( value = "新增一条xm_question信息",notes="addXmQuestion,主键如果为空，后台自动生成")
 	@ApiResponses({

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

@@ -296,6 +296,21 @@ public class XmTaskController {
 		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(xmTask);
 		return ResponseHelper.ok("成功",datas);
 	}
+
+
+	@RequestMapping(value="/getXmTaskSort",method=RequestMethod.GET)
+	public Map<String,Object> getXmTaskSort( @RequestParam Map<String,Object> xmTask){
+		User user=LoginUtils.getCurrentUserInfo();
+		PageUtils.startPage(xmTask);
+		xmTask.put("branchId",user.getBranchId());
+		List<Map<String,Object>> datas= this.xmTaskService.getXmTaskSort(xmTask);
+		Map<String,Object> m=new HashMap<>();
+		PageUtils.responePage(m,datas);
+		m.put("data",datas);
+		Tips tips=new Tips("查询成功");
+		m.put("tips", tips);
+		return m;
+	}
 	/***/
 	@ApiOperation( value = "根据主键批量修改修改任务中的某些字段信息",notes="editXmMenu")
 	@ApiResponses({

xm-core/src/main/java/com/xm/core/service/XmMenuService.java

@@ -414,5 +414,9 @@ public class XmMenuService extends BaseService {
 	public List<Map<String, Object>> getXmMenuAgeDist(Map<String, Object> xmMenu) {
 		return super.selectList("getXmMenuAgeDist",xmMenu);
 	}
+
+    public List<Map<String, Object>> getXmMenuSort(Map<String, Object> xmMenu) {
+		return super.selectList("getXmMenuSort",xmMenu);
+    }
 }
 

xm-core/src/main/java/com/xm/core/service/XmQuestionService.java

@@ -208,5 +208,9 @@ public class XmQuestionService extends BaseService {
 	public List<Map<String, Object>> getXmQuestionAgeDist(Map<String, Object> xmQuestion) {
 		return super.selectList("getXmQuestionAgeDist",xmQuestion);
 	}
+
+	public List<Map<String, Object>> getXmQuestionSort(Map<String, Object> xmQuestion) {
+		return super.selectList("getXmQuestionSort",xmQuestion);
+	}
 }
 

xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@@ -752,5 +752,9 @@ public class XmTaskService extends BaseService {
 	public List<Map<String, Object>> getXmTaskAgeDist(Map<String, Object> xmTask) {
 		return super.selectList("getXmTaskAgeDist",xmTask);
 	}
+
+	public List<Map<String, Object>> getXmTaskSort(Map<String, Object> xmTask) {
+		return super.selectList("getXmTaskSort",xmTask);
+	}
 }
 

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

@@ -253,6 +253,17 @@
 		) as a
 		group by name
 	</select>
+
+	<select id="getXmMenuSort" parameterType="HashMap" resultType="HashMap">
+		select count(*) as value,${groupBy} as id,
+		max( <if test="groupBy=='proposer_id'">proposer_name</if>
+		<if test="groupBy=='mm_userid'">mm_username</if>  ) as name from xm_menu res
+		<where>
+			<include refid="whereForMap"></include>
+			<include refid="where"></include>
+		</where>
+		group by ${groupBy}
+	</select>
 	<!--结束 自定义sql函数区域-->
 	
 

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

@@ -110,6 +110,18 @@
 		) as a
 		group by name
 	</select>
+	<select id="getXmQuestionSort" parameterType="HashMap" resultType="HashMap">
+		select count(*) as value,${groupBy} as id,
+		max( <if test="groupBy=='handler_userid'">handler_username</if>
+			 <if test="groupBy=='ask_userid'">ask_username</if>
+			 <if test="groupBy=='create_userid'">create_username</if>
+			 <if test="groupBy=='menu_id'">menu_name</if> ) as name from xm_question res
+		<where>
+			<include refid="whereForMap"></include>
+			<include refid="where"></include>
+		</where>
+		group by ${groupBy}
+	</select>
 	<!--结束 自定义sql函数区域-->
 	
 

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

@@ -440,6 +440,18 @@
 		) as a
 		group by name
 	</select>
+
+	<select id="getXmTaskSort" parameterType="HashMap" resultType="HashMap">
+		select count(*) as value,${groupBy} as id,
+		max( <if test="groupBy=='create_userid'">create_username</if>
+		<if test="groupBy=='executor_userid'">executor_username</if>
+		<if test="groupBy=='menu_id'">menu_name</if>  ) as name from xm_task res
+		<where>
+			<include refid="whereForMap"></include>
+			<include refid="where"></include>
+		</where>
+		group by ${groupBy}
+	</select>
 	<!--结束 自定义sql函数区域-->