补充业务，增加主办单位，增加上诉类型

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppSysController.java

@@ -20,12 +20,14 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.GisFormDTO;
 import com.elink.esua.epdc.dto.GisGridDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.service.SysDeptService;
+import com.elink.esua.epdc.service.SysDictService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -41,8 +43,25 @@ public class AppSysController {
     @Autowired
     private SysDeptService sysDeptService;
 
+    @Autowired
+    private SysDictService sysDictService;
+
     @PostMapping("dept/gis/getGridByCoordinate")
     public Result<GisGridDTO> getGridByCoordinate(@RequestBody GisFormDTO formDTO) {
         return new Result<GisGridDTO>().ok(sysDeptService.getCoordinate(formDTO));
     }
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.commons.tools.utils.Result<java.util.List   <   com.elink.esua.dto.SysSimpleDictDTO>>
+     * @author yujintao
+     * @date 2019/7/15 09:33
+     */
+    @GetMapping("listSimple/{dictType}")
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType) {
+        //字典分类数据
+        return sysDictService.listSimpleDictInfo(dictType);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java

@@ -106,4 +106,18 @@ public class ApiAdminController {
         return adminService.getGridByCoordinate(dto);
     }
 
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.commons.tools.utils.Result<java.util.List   <   com.elink.esua.dto.SysSimpleDictDTO>>
+     * @author yujintao
+     * @date 2019/7/15 09:33
+     */
+    @GetMapping("listSimple/{dictType}")
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType) {
+        //字典分类数据
+        return adminService.listSimpleDictInfo(dictType);
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -203,4 +203,7 @@ public interface AdminFeignClient {
      */
     @PostMapping("sys/appsys/dept/gis/getGridByCoordinate")
     Result<GisGridDTO> getGridByCoordinate(GisFormDTO formDto);
+
+    @GetMapping("sys/appsys/listSimple/{dictType}")
+    Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.dto.form.SendMessageFormDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -105,4 +106,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<GisGridDTO> getGridByCoordinate(GisFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getGridByCoordinate",formDTO);
     }
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listSimpleDictInfo", dictType);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java

@@ -80,4 +80,14 @@ public interface AdminService {
      * @date 2022/9/5 15:53
      */
     Result<GisGridDTO> getGridByCoordinate(GisFormDTO dto);
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.commons.tools.utils.Result<java.util.List   <   com.elink.esua.dto.SysSimpleDictDTO>>
+     * @author yujintao
+     * @date 2019/7/15 09:33
+     */
+    Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -73,4 +73,9 @@ public class AdminServiceImpl implements AdminService {
     public Result<GisGridDTO> getGridByCoordinate(GisFormDTO dto) {
         return adminFeignClient.getGridByCoordinate(dto);
     }
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType) {
+        return adminFeignClient.listSimpleDictInfo(dictType);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java

@@ -55,8 +55,8 @@ public class CategoryController {
     private CategoryService categoryService;
 
     @GetMapping("list")
-    public Result<List<CategoryDTO>> list(){
-        List<CategoryDTO> list = categoryService.list(new HashMap<>(1));
+    public Result<List<CategoryDTO>> list(@RequestParam Map<String, Object> params){
+        List<CategoryDTO> list = categoryService.list(params);
         return new Result<List<CategoryDTO>>().ok(list);
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml

@@ -22,6 +22,12 @@
     <select id="getList" resultType="com.elink.esua.epdc.modules.category.entity.CategoryEntity">
         select t1.*,t1.id as value,t1.category_name as label,(select t2.category_name from epdc_category t2 where t2.id=t1.pid)parentName from epdc_category t1
         where t1.del_flag = '0' AND t1.enable_flag = '1'
+        <if test="categoryType != null and categoryType != ''">
+            AND t1.category_type = #{categoryType}
+        </if>
+        <if test="infoCode != null and infoCode != ''">
+            AND t1.info_code = #{infoCode}
+        </if>
         order by t1.sort asc
     </select>