From 5023aeab4932b7d39af3db62b6d2e111e95ec41f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 30 Jul 2020 16:21:36 +0800
Subject: [PATCH] heart+1

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 .../java/com/epmet/service/impl/WorkActUserServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/ActUserRelationDao.xml            | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index 338276660c..d746c51e89 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.15
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.16
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index 72d7c54d09..0b946b3626 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.15</version>
+    <version>0.0.16</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
index aea287bb50..8ac5edd27a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
@@ -357,7 +357,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId());
         resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());
         //减去当前的
-        resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum()-1);
+        resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum());
         resultDTO.setObtainPointsActNum(historicalActInfo.getObtainPointsActNum());
         //历史活动列表
         List<UserHistoricalActInfoDTO> actInfoList=actUserRelationDao.selectAllByUserId(formDTO.getUserId(),formDTO.getCurrentActId());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
index 6d53c1f139..7f1b94d77c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
@@ -121,6 +121,7 @@
             act_user_relation acu
         WHERE
             DEL_FLAG = '0'
+            and acu.STATUS !='auditing'
             AND acu.USER_ID = #{userId}
     </select>