luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev
sunyuchao 5 years ago
parent
fc3952b77a
commit
7477d6f536
18 changed files with 9 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java
  2. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java
  3. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java
  4. 5
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java
  5. 5
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java
  6. 5
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
  7. 5
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
  8. 5
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java
  9. 1
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
  10. 1
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
  11. 4
      epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql
  12. 3
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
  13. 5
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
  14. 5
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java
  15. 5
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java
  16. 5
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java
  17. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
  18. 4
      epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql

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

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

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

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

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

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

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

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

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

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

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

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

5
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
View File

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

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

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

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

@ -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);

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

@ -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);
}

4
epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql
View File

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

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

@ -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},

5
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
View File

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

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

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

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

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

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

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

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

@ -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);

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

@ -0,0 +1,4 @@
ALTER TABLE `project_category` DROP COLUMN `IS_DISABLE`;
ALTER TABLE `project_tags` DROP COLUMN `IS_DISABLE`;
Write Preview
Loading…
Cancel
Save