分类列表查询

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 分类列表查询-接口入参
+ * @Author sun
+ */
+@Data
+public class CustomerCategoryListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    @NotBlank(message = "客户ID不能为空",groups = {CustomerCategoryListFormDTO.Category.class})
+    private String customerId;
+
+    public interface Category{}
+
+
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java

@@ -26,6 +26,10 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
 import com.epmet.service.IssueProjectCategoryDictService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,19 +54,19 @@ public class IssueProjectCategoryDictController {
     private IssueProjectCategoryDictService issueProjectCategoryDictService;
 
     @GetMapping("page")
-    public Result<PageData<IssueProjectCategoryDictDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IssueProjectCategoryDictDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<IssueProjectCategoryDictDTO> page = issueProjectCategoryDictService.page(params);
         return new Result<PageData<IssueProjectCategoryDictDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<IssueProjectCategoryDictDTO> get(@PathVariable("id") String id){
+    public Result<IssueProjectCategoryDictDTO> get(@PathVariable("id") String id) {
         IssueProjectCategoryDictDTO data = issueProjectCategoryDictService.get(id);
         return new Result<IssueProjectCategoryDictDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody IssueProjectCategoryDictDTO dto){
+    public Result save(@RequestBody IssueProjectCategoryDictDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         issueProjectCategoryDictService.save(dto);
@@ -70,7 +74,7 @@ public class IssueProjectCategoryDictController {
     }
 
     @PutMapping
-    public Result update(@RequestBody IssueProjectCategoryDictDTO dto){
+    public Result update(@RequestBody IssueProjectCategoryDictDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         issueProjectCategoryDictService.update(dto);
@@ -78,7 +82,7 @@ public class IssueProjectCategoryDictController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         issueProjectCategoryDictService.delete(ids);
@@ -91,4 +95,16 @@ public class IssueProjectCategoryDictController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectCategoryDictExcel.class);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    @PostMapping("list")
+    public Result<List<CustomerCategoryListResultDTO>> categoryList(@RequestBody CustomerCategoryListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, CustomerCategoryListFormDTO.Category.class);
+        return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(formDTO));
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java

@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 议题项目分类字典
@@ -30,4 +34,14 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategoryDictEntity> {
 
+    /**
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    List<CustomerCategoryListResultDTO> selectCustomerCategoryList(@Param("customerId") String customerId);
+    /**
+     * @Description 查询某个分类的下级分类
+     * @Author sun
+     **/
+    List<CustomerCategoryListResultDTO> subCategoryList(@Param("categoryId") String categoryId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java

@@ -20,6 +20,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 
 import java.util.List;
@@ -92,4 +94,12 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @date 2020-12-08
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java

@@ -25,6 +25,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
@@ -65,8 +67,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         return ConvertUtils.sourceToTarget(entityList, IssueProjectCategoryDictDTO.class);
     }
 
-    private QueryWrapper<IssueProjectCategoryDictEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<IssueProjectCategoryDictEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IssueProjectCategoryDictEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +103,16 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    @Override
+    public List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO) {
+        List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(formDTO.getCustomerId());
+        return resultList;
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -3,6 +3,37 @@
 
 <mapper namespace="com.epmet.dao.IssueProjectCategoryDictDao">
 
+    <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 start-->
+    <resultMap id="categoryTree" type="com.epmet.dto.result.CustomerCategoryListResultDTO">
+        <id column="categoryId" property="id"/>
+        <result column="categoryName" property="name"/>
 
+        <collection property="subCategory" column="categoryId" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
+        </collection>
+    </resultMap>
+    <select id="selectCustomerCategoryList" resultMap="categoryTree">
+        SELECT
+            id AS "id",
+            category_type AS "name"
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND category_type = '1'
+        AND customer_id = #{customerId}
+        ORDER BY sort ASC
+    </select>
+    <select id="subCategoryList" resultMap="categoryTree">
+        SELECT
+            id AS "id",
+            category_type AS "name"
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND pid = #{categoryId}
+        ORDER BY sort ASC
+    </select>
+    <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
 
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 获取议题的分类、标签列表-接口返参
+ * @Author sun
+ */
+@Data
+public class CustomerCategoryListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+
+	/**
+	 * 分类Id
+	 */
+	private String id;
+	/**
+	 * 分类名称
+	 */
+	private String name;
+
+	/**
+	 * 子级分类对象
+	 */
+	private List<CustomerCategoryListResultDTO> subCategory;
+
+}