事件列表合并为一个查询接口，通过eventType路由到指定接口进行查询

更新DictKeys注释
优化事件分类查询接口，简化返回数据
根据当前用户查询所属部门接口增加注释

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventController.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
-import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.RemoteEventService;
+import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -16,6 +16,21 @@ public class EventController {
     @Resource
     private RemoteEventService eventService;
 
+    @Resource
+    private RemoteEventTodoService eventTodoService;
+
+    @Resource
+    private RemoteEventCompletedService eventCompletedService;
+
+    @Resource
+    private RemoteEventVerfiedService eventVerfiedService;
+
+    @Resource
+    private RemoteEventDistributeService eventDistributeService;
+
+    @Resource
+    private RemoteEventFileService eventFileService;
+
     /**
      * 查询事件列表接口（分页）
      * @param pageNum
@@ -23,12 +38,36 @@ public class EventController {
      * @return
      */
     @GetMapping("/event/getList")
-    public AjaxResult getEventList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize) {
-        TableDataInfo eventList = eventService.getEventList(pageNum, pageSize);
-        if (HttpStatus.SUCCESS == eventList.getCode()) {
-            return AjaxResult.success(eventList.getRows());
+    public AjaxResult getEventList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize, @RequestParam("eventType") String eventType) {
+        TableDataInfo data = new TableDataInfo();
+        switch (eventType){
+            case "1":
+                data = eventService.getList(pageNum,pageSize);
+                break;
+            case "2":
+                data = eventTodoService.getList(pageNum,pageSize);
+                break;
+            case "3":
+                data = eventCompletedService.getList(pageNum,pageSize);
+                break;
+            case "4":
+                data = eventVerfiedService.getList(pageNum,pageSize);
+                break;
+            case "5":
+                data = eventDistributeService.getList(pageNum,pageSize);
+                break;
+            case "6":
+                data = eventFileService.getList(pageNum,pageSize);
+                break;
+            default:
+                data.setCode(500);
+                data.setMsg("参数错误");
+                break;
+        }
+        if (HttpStatus.SUCCESS == data.getCode()) {
+            return AjaxResult.success(data.getRows());
         } else {
-            return AjaxResult.error(eventList.getCode(), eventList.getMsg());
+            return AjaxResult.error(data.getCode(), data.getMsg());
         }
     }
 

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventTypeController.java

@@ -10,6 +10,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/AppEventType")
@@ -22,10 +27,23 @@ public class EventTypeController {
      * 查询事件分类列表
      */
     @GetMapping("/eventType/list")
-    public AjaxResult getList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize){
-        TableDataInfo data = eventTypeService.getList(pageNum, pageSize);
+    public AjaxResult getList(){
+        TableDataInfo data = eventTypeService.getList();
         if(HttpStatus.SUCCESS == data.getCode()){
-            return AjaxResult.success(data.getRows());
+            if(!data.getRows().isEmpty()){
+                List<Map<String, Object>> list = new ArrayList<>();
+                for (Map<String, Object> row : (List<Map<String, Object>>) data.getRows()) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("id", row.get("eventTypeId").toString());
+                    map.put("name", row.get("eventTypeName").toString());
+                    map.put("type", row.get("type").toString());
+                    map.put("parentId", row.get("eventTypeParentId").toString());
+                    list.add(map);
+                }
+                return AjaxResult.success(list);
+            }else{
+                return AjaxResult.error(500, "rows is empty");
+            }
         }else{
             return AjaxResult.error(data.getCode(), data.getMsg());
         }

src/main/java/com/sooka/sponest/mobile/system/dept/DeptController.java

@@ -26,6 +26,10 @@ public class DeptController {
         return AjaxResult.success(deptList.get("data"));
     }
 
+    /**
+     * 获取当日用户的所属部门
+     * @return
+     */
     @GetMapping("/userDeptSelect")
     public AjaxResult getUserDeptSelect(){
         return remoteSystemBaseService.getUserDeptSelect();