Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

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>
 

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 != supportCount">support_count = #{supportCount},</if>
-            <if test="null != oppositionCount">opposition_count = #{oppositionCount}</if>
+            <if test="null != oppositionCount">opposition_count = #{oppositionCount},</if>
-            <if test="null != votableCount">votable_count = #{votableCount}</if>
+            <if test="null != votableCount">votable_count = #{votableCount},</if>
-            <if test="null != updatedBy">updated_by = #{updatedBy}</if>
+            <if test="null != updatedBy">updated_by = #{updatedBy},</if>
             UPDATED_TIME = NOW ()
         </set>
         WHERE