heart+1

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 # 使用现有网络

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>

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());

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>