爱心互助-居民端

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -263,9 +263,10 @@ public class ResiActListController {
      * @Date 10:29 2020-07-23
      **/
     @PostMapping("insertlive")
-    public Result inSertlive(@LoginUser TokenDto tokenDto, @RequestBody ResiActInsertLiveFormDTO formDTO) {
+    public Result insertLive(@LoginUser TokenDto tokenDto, @RequestBody ResiActInsertLiveFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return actLiveRecService.inSertlive(tokenDto, formDTO);
+        Result<String> result =  actLiveRecService.insertLive(tokenDto, formDTO);
+        return new Result();
     }
 
     /**

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

@@ -119,7 +119,7 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @Author zhangyong
      * @Date 13:53 2020-07-20
      **/
-    List<ResiMyActResultDTO> selectListActMyHavePassed(ResiMyActFormDTO formDTO);
+    List<ResiMyActResultDTO> selectListMyActIHavePassed(ResiMyActFormDTO formDTO);
 
     /**
      * 我的活动-已结束

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

@@ -175,4 +175,26 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
      * @Date 2020/7/26 22:38
      **/
     Integer selectCountByReward(@Param("actId") String actId, @Param("rewardFlag")String rewardFlag);
+
+    /**
+     * 取消报名
+     * 根据用户id和活动id，修改 用户活动关系表
+     *
+     * @param entity
+     * @return void
+     * @Author zhangyong
+     * @Date 14:39 2020-07-22
+     **/
+    void cancelSignUp(ActUserRelationEntity entity);
+
+    /**
+     * 当前用户是否曾报名参加过该活动
+     *
+     * @param actId
+     * @param userId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 14:35 2020-07-27
+     **/
+    Integer selectCountByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId);
 }

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

@@ -52,5 +52,5 @@ public interface ActLiveRecService extends BaseService<ActLiveRecEntity> {
      * @Author zhangyong
      * @Date 13:40 2020-07-23
      **/
-    Result<String> inSertlive(TokenDto tokenDto, ResiActInsertLiveFormDTO formDTO);
+    Result<String> insertLive(TokenDto tokenDto, ResiActInsertLiveFormDTO formDTO);
 }

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

@@ -152,6 +152,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     public Result<List<ResiMyActResultDTO>> myActListAuditing(TokenDto tokenDto, ResiMyActFormDTO formDto) {
         formDto.setUserId(tokenDto.getUserId());
+        int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageNo(pageIndex);
         List<ResiMyActResultDTO> myAct = baseDao.selectListMyActAuditing(formDto);
         return new Result<List<ResiMyActResultDTO>>().ok(myAct);
     }
@@ -159,6 +161,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     public Result<List<ResiMyActResultDTO>> myActListRefused(TokenDto tokenDto, ResiMyActFormDTO formDto) {
         formDto.setUserId(tokenDto.getUserId());
+        int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageNo(pageIndex);
         List<ResiMyActResultDTO> myAct = baseDao.selectListActRefused(formDto);
         return new Result<List<ResiMyActResultDTO>>().ok(myAct);
     }
@@ -166,13 +170,17 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     public Result<List<ResiMyActResultDTO>> myActListPassed(TokenDto tokenDto, ResiMyActFormDTO formDto) {
         formDto.setUserId(tokenDto.getUserId());
-        List<ResiMyActResultDTO> myAct = baseDao.selectListActMyHavePassed(formDto);
+        int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageNo(pageIndex);
+        List<ResiMyActResultDTO> myAct = baseDao.selectListMyActIHavePassed(formDto);
         return new Result<List<ResiMyActResultDTO>>().ok(myAct);
     }
 
     @Override
     public Result<List<ResiMyActResultDTO>> myActListCanceld(TokenDto tokenDto, ResiMyActFormDTO formDto) {
         formDto.setUserId(tokenDto.getUserId());
+        int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageNo(pageIndex);
         List<ResiMyActResultDTO> myAct = baseDao.selectListMyActCanceld(formDto);
         return new Result<List<ResiMyActResultDTO>>().ok(myAct);
     }

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

@@ -106,7 +106,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<String> inSertlive(TokenDto tokenDto, ResiActInsertLiveFormDTO formDTO) {
+    public Result<String> insertLive(TokenDto tokenDto, ResiActInsertLiveFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
         // 文本校验
         ValidityVerification verification = new ValidityVerification();

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

@@ -86,7 +86,7 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
         if (formDTO.getSyncLive() == NumConstant.ONE){
             // 签到内容同步到实况
             ResiActInsertLiveFormDTO liveFormDTO = ConvertUtils.sourceToTarget(formDTO, ResiActInsertLiveFormDTO.class);
-            Result<String> inSertlive = actLiveRecService.inSertlive(tokenDto, liveFormDTO);
+            Result<String> inSertlive = actLiveRecService.insertLive(tokenDto, liveFormDTO);
             //实况id, 当sync_live=1时此列有值
             dto.setLiveId(inSertlive.getData());
         }

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

@@ -251,20 +251,29 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             heartUserInfoDao.insert(entity);
         }
         if (signUp){
-            // 4.插入用户活动关系表
+            // 4.插入活动日志表
-            ActUserRelationEntity entity = new ActUserRelationEntity();
-            entity.setActId(formDTO.getActId());
-            entity.setUserId(formDTO.getUserId());
-            entity.setStatus(ActConstant.ACT_USER_STATUS_AUDITING);
-            baseDao.insert(entity);
-
-            // 5.插入活动日志表
             ActUserLogEntity userLogEntity = new ActUserLogEntity();
             userLogEntity.setActId(formDTO.getActId());
             userLogEntity.setUserId(formDTO.getUserId());
             userLogEntity.setOperationType(ActConstant.ACT_USER_LOG_OPER_AUDITING);
             actUserLogService.insert(userLogEntity);
         }
+        ActUserRelationEntity entity = new ActUserRelationEntity();
+        entity.setActId(formDTO.getActId());
+        entity.setUserId(formDTO.getUserId());
+        entity.setStatus(ActConstant.ACT_USER_STATUS_AUDITING);
+        Integer operationCount = baseDao.selectCountByActIdAndUserId(entity.getActId(), entity.getUserId());
+        if (operationCount == NumConstant.ZERO){
+            // 用户第一次参加 这次的活动
+            // 5.插入用户活动关系表
+            baseDao.insert(entity);
+        } else {
+            // 取消报名后，重新报名参加活动。修改状态
+            // 5.修改用户活动关系表
+            entity.setCancelReason("");
+            entity.setCancelTime(null);
+            baseDao.cancelSignUp(entity);
+        }
     }
 
     /**

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

@@ -66,7 +66,7 @@
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
         LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0'  AND (re.`STATUS` = 'auditing' OR re.`STATUS` = 'passed') GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND i.ACT_STATUS = 'published'
 		AND  <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() -- 报名截止时间  >= 当前时间
@@ -92,7 +92,7 @@
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
         LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND (re.`STATUS` = 'auditing' OR re.`STATUS` = 'passed') GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND i.ACT_STATUS = 'published'
         AND  <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() -- 报名截止时间  >= 当前时间
@@ -119,7 +119,7 @@
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
         LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0'
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND (re.`STATUS` = 'auditing' OR re.`STATUS` = 'passed') GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         --  活动开始时间 > 当前时间 并且  报名截止时间 &lt; 当前时间   报名已结束,活动未开始   未开始
         AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() )
@@ -195,7 +195,7 @@
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'auditing' AS actCurrentState -- 活动状态
         FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'auditing'
@@ -218,7 +218,7 @@
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'passed' AS actCurrentState -- 活动状态
         FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'passed'
@@ -241,7 +241,7 @@
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'refused' AS actCurrentState -- 活动状态
         FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'refused'
@@ -264,7 +264,7 @@
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'canceld' AS actCurrentState -- 活动状态
         FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() -- 活动结束时间 &lt; 当前时间, 活动已结束
@@ -457,6 +457,7 @@
         WHERE i.DEL_FLAG = '0'
         AND r.USER_ID = #{userId}
         AND i.ACT_STATUS = 'published'
+        AND r.`STATUS` != 'refused' AND r.`STATUS` != 'canceled'
         AND ((#{actStartTime} BETWEEN i.ACT_START_TIME AND i.ACT_END_TIME OR #{actEndTime} BETWEEN i.ACT_START_TIME AND i.ACT_END_TIME)
                 or (i.ACT_START_TIME BETWEEN #{actStartTime} AND #{actEndTime} OR i.ACT_END_TIME BETWEEN #{actStartTime} AND #{actEndTime}));
     </select>

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

@@ -252,4 +252,36 @@
             and aur.REWARD_FLAG=#{rewardFlag}
             AND aur.ACT_ID = #{actId}
     </select>
+
+    <update id="cancelSignUp" parameterType="com.epmet.entity.ActUserRelationEntity">
+        UPDATE act_user_relation
+        SET
+        <if test="status != null and status.trim() != ''">
+            STATUS = #{status},
+        </if>
+        <if test="cancelReason != null">
+            CANCEL_TIME = #{cancelTime},
+            CANCEL_REASON = #{cancelReason},
+        </if>
+        <if test="userId != null and userId != ''">
+            UPDATED_BY =  #{userId},
+        </if>
+        UPDATED_TIME = NOW()
+        WHERE
+        DEL_FLAG = '0'
+        AND ACT_ID = #{actId}
+        AND USER_ID = #{userId}
+    </update>
+
+    <!-- 当前用户是否曾报名参加过该活动 -->
+    <select id="selectCountByActIdAndUserId" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT
+            count( aur.id ) as total
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND aur.USER_ID = #{userId}
+            AND aur.ACT_ID = #{actId}
+    </select>
 </mapper>