议题项目分类db调整引起的代码逻辑调整

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

@@ -43,6 +43,11 @@ public class IssueTagsFormDTO implements Serializable {
      */
     private String name;
 
+    /**
+     * 是否禁用(enable:启用 disable:禁用)
+     */
+    private String isDisable;
+
     /**
      * 删除标识 0.未删除 1.已删除
      */

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

@@ -37,7 +37,7 @@ import java.util.List;
 public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategoryDictEntity> {
 
     /**
-     * @Description 客户分类列表查询，按分类升序排列
+     * @Description 客户分类列表查询，按分类升序排列，查询未被禁用的
      * @Author sun
      **/
     List<CustomerCategoryListResultDTO> selectCustomerCategoryList(@Param("customerId") String customerId);

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

@@ -208,6 +208,8 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
             categoryList.forEach(cl -> {
                 if (ca.getId().equals(cl.getId())) {
                     entity.setCategoryPids(cl.getPids());
+                    entity.setCategoryCode(cl.getCategoryCode());
+                    entity.setIsDisable(cl.getIsDisable());
                 }
             });
             entityList.add(entity);

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

@@ -123,7 +123,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     /**
      * @param customerId
      * @return
-     * @Description 客户分类列表查询，按分类升序排列
+     * @Description 客户分类列表查询，按分类升序排列，查询未被禁用的
      * @Author sun
      **/
     @Override

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

@@ -158,6 +158,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         entity.setIsDefault(NumConstant.ONE_STR);
         entity.setIssueUseCount(NumConstant.ZERO);
         entity.setProjectUseCount(NumConstant.ZERO);
+        entity.setIsDisable(ModuleConstants.ID_ENABLE);
         issueProjectTagDictDao.insert(entity);
         IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
         issueCategoryTagResultDTO.setId(entity.getId());
@@ -234,6 +235,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 n.setCustomerId(customerId);
                 n.setGridId(issueEntity.getGridId());
                 n.setIssueId(form.getIssueId());
+                n.setIsDisable(ModuleConstants.ID_ENABLE);
             });
             baseDao.insertNewTags(needInsert);
         }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java

@@ -170,4 +170,12 @@ public interface ModuleConstants {
      * 类别名称：其他
      */
     String CATEGORY_NAME_OTHERS = "其他";
+    /**
+     * 是否禁用  enable:启用
+     */
+    String ID_ENABLE = "enable";
+    /**
+     * 是否禁用  disable:禁用
+     */
+    String IS_DISABLE = "disable";
 }

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

@@ -23,6 +23,7 @@
             del_flag = '0'
         AND category_type = '1'
         AND customer_id = #{customerId}
+        AND is_disable = 'enable'
         ORDER BY sort ASC
     </select>
     <select id="subCategoryList" resultMap="categoryTree">
@@ -36,6 +37,7 @@
             del_flag = '0'
         AND pid = #{id}
         AND customer_id = #{customerId}
+        AND is_disable = 'enable'
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->

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

@@ -70,7 +70,7 @@
 
     <!-- 插入新的标签 -->
     <insert id="insertNewTags">
-        INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, IS_DISABLE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
             <foreach collection="tags" item="l" separator=",">
                 (
@@ -80,6 +80,7 @@
                 #{l.issueId},
                 #{l.tagId},
                 #{l.name},
+                #{l.isDisable},
                 #{l.delFlag},
                 #{l.revision},
                 #{l.createdBy},

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

@@ -32,6 +32,11 @@ public class ProjectCategoryDTOResultDTO implements Serializable {
 	 */
 	private String pids;
 
+	/**
+	 * 上级分类编码
+	 */
+	private String parentCategoryCode;
+
 	/**
 	 * 分类编码，分类编码+customer_id唯一
 	 */
@@ -52,4 +57,9 @@ public class ProjectCategoryDTOResultDTO implements Serializable {
 	 */
 	private Integer sort;
 
+	/**
+	 * 是否禁用(enable:启用 disable:禁用)
+	 */
+	private String isDisable;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java

@@ -175,6 +175,8 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
             categoryList.forEach(cl -> {
                 if (ca.getId().equals(cl.getId())) {
                     entity.setCategoryPids(cl.getPids());
+                    entity.setCategoryCode(cl.getCategoryCode());
+                    entity.setIsDisable(cl.getIsDisable());
                 }
             });
             entityList.add(entity);