客户分类列表

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CustomerCategoryResultDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 客户分类列表
+ *
+ * @Author ZY
+ * @DateTime 2021/03/23
+ */
+@Data
+public class CustomerCategoryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4769136806332933579L;
+
+    /**
+     * 分类Id
+     */
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 是否禁用(enable:启用 disable:禁用)
+     */
+    private String isDisable;
+
+    /**
+     * 二级分类
+     */
+    private List<CustomerCategoryResultDTO> children;
+
+    /**
+     * pid
+     */
+    private String pid;
+}

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

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -32,6 +33,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.CustomerCategoryResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
@@ -238,5 +240,23 @@ public class IssueProjectCategoryDictController {
         }
         throw new RenException("操作类型为空，或错误。type：" + formDTO.getType());
     }
+
+    /**
+     * 客户分类列表
+     *   按客户查询已有一级二级分类列表，升序排列，全部查询，不涉及分页
+     *
+     * @param map
+     *          customerId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.CustomerCategoryResultDTO>>
+     * @Author zhangyong
+     * @Date 16:30 2021-03-23
+     **/
+    @PostMapping("customercategorylist")
+    public Result<List<CustomerCategoryResultDTO>> customerCategoryList(@RequestBody Map<String, String> map) {
+        if (StringUtils.isBlank(map.get(FieldConstant.CUSTOMER_ID_HUMP))) {
+            throw new RenException("客户id 不能为空");
+        }
+        return new Result<List<CustomerCategoryResultDTO>>().ok(issueProjectCategoryDictService.customerCategoryList(map.get(FieldConstant.CUSTOMER_ID_HUMP)));
+    }
 }
 

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

@@ -23,6 +23,7 @@ import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.IsDisableCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.CustomerCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -142,4 +143,17 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      **/
     Integer isCategoryName(@Param("customerId") String customerId, @Param("categoryName") String categoryName,
                            @Param("pid") String pid, @Param("id") String id);
+
+    /**
+     * 获取客户所有的 分类字典 信息(包含已被禁用的)
+     *
+     * @param customerId
+     * @param pid           pid = 0  查询一级分类
+     *                      pid != 0 查询二级分类
+     *
+     * @return java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>
+     * @Author zhangyong
+     * @Date 14:10 2021-03-22
+     **/
+    List<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
 }

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

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.CustomerCategoryResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
@@ -196,4 +197,15 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Date 10:27 2021-03-23
      **/
     Result<String> editSecondCategory(SecondCategoryFormDTO formDTO);
+
+    /**
+     * 客户分类列表
+     *   按客户查询已有一级二级分类列表，升序排列，全部查询，不涉及分页
+     *
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.result.CustomerCategoryResultDTO>
+     * @Author zhangyong
+     * @Date 16:30 2021-03-23
+     **/
+    List<CustomerCategoryResultDTO> customerCategoryList(String customerId);
 }

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

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -33,10 +32,7 @@ import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectRelationDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.ProjectCategoryDTOResultDTO;
-import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
-import com.epmet.dto.result.ProjectIssueDTOResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.feign.GovProjectOpenFeignClient;
@@ -430,4 +426,27 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         baseDao.updateById(entity);
         return new Result<>();
     }
+
+    @Override
+    public List<CustomerCategoryResultDTO> customerCategoryList(String customerId) {
+        List<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
+        List<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
+
+        for (CustomerCategoryResultDTO p : parentCategoryDict) {
+            List<CustomerCategoryResultDTO> children = new ArrayList<>();
+            for (CustomerCategoryResultDTO c : childrenCategoryDict) {
+                if (p.getCategoryId().equals(c.getPid())) {
+                    CustomerCategoryResultDTO dto = new CustomerCategoryResultDTO();
+                    dto.setCategoryId(c.getCategoryId());
+                    dto.setCategoryName(c.getCategoryName());
+                    dto.setSort(c.getSort());
+                    dto.setIsDisable(c.getIsDisable());
+                    dto.setPid(c.getPid());
+                    children.add(dto);
+                }
+            }
+            p.setChildren(children);
+        }
+        return parentCategoryDict;
+    }
 }

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

@@ -188,4 +188,24 @@
                 AND id != #{id}
             </if>
     </select>
+
+    <select id="selectListAllCategoryDict" resultType="com.epmet.dto.result.CustomerCategoryResultDTO">
+        SELECT
+            CATEGORY_CODE categoryCode,
+            CATEGORY_NAME categoryName,
+            IS_DISABLE isDisable,
+            SORT,
+            PID,
+            ID categoryId
+        FROM issue_project_category_dict d
+        WHERE d.CUSTOMER_ID = #{customerId}
+        AND d.DEL_FLAG ='0'
+        <if test="pid != null and pid == 0">
+            AND d.PID = '0'
+        </if>
+        <if test="pid != null and pid != 0">
+            AND d.PID != '0'
+        </if>
+        ORDER BY CATEGORY_CODE ASC
+    </select>
 </mapper>