From 9ab37a1e3d0aefdff9d458ac0687cc288fc24e47 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 28 Dec 2021 16:01:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B2=A1=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/project/ProjectProcessDao.xml    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
index 9f8b72f16e..4173e8cecb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
@@ -183,17 +183,6 @@
             AND staff.PROJECT_ID = #{projectId}
         </if>
         AND staff.CUSTOMER_ID = #{customerId}
-
-         <if test='null != projectStatus and "" != projectStatus'>
-            AND project.STATUS = #{projectStatus}
-          </if>
-
-         <if test='null != dateId and "" != dateId'>
-            AND (
-                 DATE_FORMAT(relation.UPDATED_TIME , '%Y%m%d')  = #{dateId}
-                )
-         </if>
-
         ORDER BY staff.PROJECT_ID,staff.CREATED_TIME ASC
     </select>
 

From 5da3b40d93191bcbc1e64d1adc28510818f5f865 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 28 Dec 2021 16:33:48 +0800
Subject: [PATCH 2/2] douhao

---
 .../src/main/resources/mapper/IssueVoteStatisticalDao.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
index 3e124c02ad..1542599a27 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
@@ -233,10 +233,10 @@
         UPDATE
         issue_vote_statistical
         <set>
-            <if test="null != supportCount">support_count = #{supportCount}</if>
-            <if test="null != oppositionCount">opposition_count = #{oppositionCount}</if>
-            <if test="null != votableCount">votable_count = #{votableCount}</if>
-            <if test="null != updatedBy">updated_by = #{updatedBy}</if>
+            <if test="null != supportCount">support_count = #{supportCount},</if>
+            <if test="null != oppositionCount">opposition_count = #{oppositionCount},</if>
+            <if test="null != votableCount">votable_count = #{votableCount},</if>
+            <if test="null != updatedBy">updated_by = #{updatedBy},</if>
             UPDATED_TIME = NOW ()
         </set>
         WHERE