From def07cb14e279593db3a26f1a60c2e8731c6eb7b Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Wed, 27 Nov 2019 14:30:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-demo/epdc-demo-server/pom.xml        | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
index 74a2db545..f72212dbd 100644
--- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
@@ -84,38 +84,38 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${dockerfile-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>default</id>
-                        <goals>
-                            <!--如果package时不想用docker打包,就注释掉这个goal-->
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <username>admin</username>
-                    <password>elink888</password>
-                    <repository>47.104.85.99:9002/repository/docker-private/</repository>
-                    <tag>latest</tag>
-                    <buildArgs>
-                        <!--提供参数向Dockerfile传递-->
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-deploy-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <skip>true</skip>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>com.spotify</groupId>-->
+<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
+<!--                <version>${dockerfile-maven-plugin.version}</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>default</id>-->
+<!--                        <goals>-->
+<!--                            &lt;!&ndash;如果package时不想用docker打包,就注释掉这个goal&ndash;&gt;-->
+<!--                            <goal>build</goal>-->
+<!--                            <goal>push</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <username>admin</username>-->
+<!--                    <password>elink888</password>-->
+<!--                    <repository>47.104.85.99:9002/repository/docker-private/</repository>-->
+<!--                    <tag>latest</tag>-->
+<!--                    <buildArgs>-->
+<!--                        &lt;!&ndash;提供参数向Dockerfile传递&ndash;&gt;-->
+<!--                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>-->
+<!--                    </buildArgs>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 

From 307f5c33a2c4c10064b83bf50895d1368a773939 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 27 Nov 2019 14:47:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/issue/IssueDao.xml                | 2 +-
 .../src/main/resources/mapper/item/ItemDao.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index af567a471..eb8f971ab 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -293,7 +293,7 @@
         SELECT
             CREATED_TIME AS createdTime,
             advice,
-            case STATE WHEN 0 THEN '【审核】' WHEN 1 THEN '【反馈】' WHEN '2' THEN '【关闭】' ELSE '' END AS stateName
+            case STATE WHEN 0 THEN '【审核】' WHEN 1 THEN '【反馈】' WHEN '2' THEN '【关闭】' WHEN 3 THEN '【转议题】' ELSE '' END AS stateName
         FROM
             epdc_issue_handle
         WHERE
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index cd23d1337..5b829890d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -507,7 +507,7 @@
             CREATED_TIME AS createdTime,
             advice,
             HANDLER_DEPT AS handlerDept,
-            CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END AS progressName,
+            CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' WHEN 3 THEN '【转议题】' ELSE '' END AS progressName,
             null AS DEPT_NAME
         FROM
             epdc_issue_handle