议题、项目对应的分类、标签关系表去掉多余字段

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java

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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java

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

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java

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

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

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

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

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

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

@@ -43,11 +43,6 @@ 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/entity/IssueCategoryEntity.java

@@ -68,9 +68,4 @@ public class IssueCategoryEntity extends BaseEpmetEntity {
 	 */
 	private String categoryCode;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java

@@ -63,9 +63,4 @@ public class IssueTagsEntity extends BaseEpmetEntity {
      */
 	private String tagName;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

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

@@ -209,7 +209,6 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
                 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/IssueTagsServiceImpl.java

@@ -235,7 +235,6 @@ 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/resources/db/migration/V0.0.12__del_category_tag_field.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `issue_category` DROP COLUMN `IS_DISABLE`;
+
+ALTER TABLE `issue_tags` DROP COLUMN `IS_DISABLE`;
+

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, IS_DISABLE, 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, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
             <foreach collection="tags" item="l" separator=",">
                 (
@@ -80,7 +80,6 @@
                 #{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/ProjectCategoryDTO.java

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

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

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

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java

@@ -68,9 +68,4 @@ public class ProjectCategoryEntity extends BaseEpmetEntity {
 	 */
 	private String categoryCode;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java

@@ -58,9 +58,4 @@ public class ProjectTagsEntity extends BaseEpmetEntity {
      */
 	private String tagName;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

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

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

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `project_category` DROP COLUMN `IS_DISABLE`;
+
+ALTER TABLE `project_tags` DROP COLUMN `IS_DISABLE`;
+