userdetail接口修改

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java

@@ -24,4 +24,6 @@ public class AactUserDetailFormDTO implements Serializable {
     @NotBlank(message = "主键不能为空", groups = {AddUserInternalGroup.class})
     private String actUserRelationId;
 
+    @NotBlank(message = "当前活动id不能为空", groups = {UserHistoricalActFormDTO.AddUserInternalGroup.class})
+    private String currentActId;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java

@@ -97,11 +97,12 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
     /**
      * @return java.lang.Integer
      * @param userId
+     * @param currentActId
      * @author yinzuomei
      * @description 报名活动个数（act_user_realation）
      * @Date 2020/7/23 15:57
      **/
-    Integer countSignUpActNum(String userId);
+    Integer countSignUpActNum(@Param("userId")String userId,@Param("currentActId") String currentActId);
 
     /**
      * @return java.lang.Integer

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@@ -348,7 +348,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
          ）
          */
         resultDTO.setStatus(actUserRelationDTO.getStatus());
-        HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId());
+        HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId(),formDTO.getCurrentActId());
         resultDTO.setHistoricalActInfo(historicalActInfo);
         if(ActConstant.ACT_USER_STATUS_AUDITING.equals(resultDTO.getStatus())){
             //被拒绝过，才赋值
@@ -399,7 +399,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
             resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
         }
         //参与活动统计值
-        HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId());
+        HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId(),formDTO.getCurrentActId());
         resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());
         //减去当前的
         resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum());
@@ -639,11 +639,12 @@ public class WorkActUserServiceImpl implements WorkActUserService {
     /**
      * @return com.epmet.dto.result.work.HistoricalActInfo
      * @param userId
+     * @param currentActId
      * @author yinzuomei
      * @description 用户历史活动情况
      * @Date 2020/7/23 15:56
      **/
-    private HistoricalActInfo getHistoricalActInfo(String userId) {
+    private HistoricalActInfo getHistoricalActInfo(String userId,String currentActId) {
         HistoricalActInfo historicalActInfo=new HistoricalActInfo();
         /**
          * 实际参加活动个数(已经签到的)
@@ -653,7 +654,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         /**
          * 报名活动个数（act_user_realation）
          */
-         Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId);
+         Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId,currentActId);
         historicalActInfo.setSignUpActNum(signUpActNum);
         /**
          * 获得积分活动个数

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml

@@ -114,7 +114,7 @@
     </select>
 
     <!--  报名活动个数（act_user_realation）  -->
-    <select id="countSignUpActNum" resultType="java.lang.Integer" parameterType="java.lang.String">
+    <select id="countSignUpActNum" resultType="java.lang.Integer" parameterType="map">
         SELECT
             count( 1 ) as total
         FROM
@@ -123,6 +123,9 @@
             DEL_FLAG = '0'
             and acu.STATUS !='auditing'
             AND acu.USER_ID = #{userId}
+            <if test="currentActId != null and currentActId != ''">
+                and acu.ACT_ID != #{currentActId}
+            </if>
     </select>
 
     <!--  获得积分活动个数  -->