From 1f08c1f64cfad0e5debd3746f3c89e0249ac0092 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 11 Dec 2020 13:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9/=E4=BF=9D=E5=AD=98=20tagName=E4=BF=AE=E6=94=B9name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/IssueTagFormDTO.java   | 2 +-
 .../src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java  | 2 +-
 .../java/com/epmet/service/impl/IssueTagsServiceImpl.java   | 6 +++---
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml    | 2 +-
 .../src/main/resources/mapper/IssueTagsDao.xml              | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
index b49075bce4..3b9cfedb13 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
@@ -15,7 +15,7 @@ public class IssueTagFormDTO implements Serializable {
 
     private String id;
 
-    private String tagName;
+    private String name;
 
     private String categoryId;
 
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
index e813b866f5..8cb89dc4d7 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
@@ -41,7 +41,7 @@ public class IssueTagsFormDTO implements Serializable {
     /**
      * 标签名称
      */
-    private String tagName;
+    private String name;
 
     /**
      * 删除标识 0.未删除 1.已删除
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index fbe4f9782c..744852e874 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -180,7 +180,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 tags.forEach(t -> {
                     // 缓存标签 -1
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(t.getTagName());
+                    issueCategoryTagResultDTO.setName(t.getName());
                     issueCategoryTagResultDTO.setId(t.getId());
                     dictRedis.editTagUseCount(customerId,t.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
@@ -201,7 +201,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             if (!CollectionUtils.isEmpty(delList)){
                 delList.forEach(d -> {
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(d.getTagName());
+                    issueCategoryTagResultDTO.setName(d.getName());
                     issueCategoryTagResultDTO.setId(d.getId());
                     dictRedis.editTagUseCount(customerId,d.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
@@ -214,7 +214,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 addList.forEach(a -> {
                     // 缓存标签+1
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(a.getTagName());
+                    issueCategoryTagResultDTO.setName(a.getName());
                     issueCategoryTagResultDTO.setId(a.getId());
                     dictRedis.editTagUseCount(customerId,a.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ZERO_STR);
                 });
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 2c5f2aab17..8ed29444c2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -24,7 +24,7 @@
     <!-- 查询标签ID -->
     <select id="selectTagId" resultType="com.epmet.dto.form.IssueTagFormDTO">
         SELECT ID AS tagId,
-               TAG_NAME,
+               TAG_NAME AS name,
                CATEGORY_ID,
                id
         FROM issue_project_tag_dict
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
index 9b217b6223..5f134b85a3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
@@ -42,7 +42,7 @@
     <select id="selectTagsByIssueId" resultType="com.epmet.dto.form.IssueTagFormDTO">
         SELECT
             it.TAG_ID AS id,
-            it.TAG_NAME,
+            it.TAG_NAME as name,
             td.CATEGORY_ID,
             it.TAG_ID AS tagId
         FROM issue_tags it
@@ -79,7 +79,7 @@
                 #{l.gridId},
                 #{l.issueId},
                 #{l.tagId},
-                #{l.tagName},
+                #{l.name},
                 #{l.delFlag},
                 #{l.revision},
                 #{l.createdBy},