活动报名接口bug修改

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java

@@ -86,10 +86,21 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
 
     /**
      * 自动审核
+     *
      * @param actId
      * @return
      */
-    List<ActUserRelationDTO> selectListActUserInfo(@Param("actId")String actId);
+    List<ActUserRelationDTO> selectListActUserInfo(@Param("actId") String actId);
 
     List<ActUserClockResultDTO> getActUserClockPageFromPC(Map<String, Object> params);
+
+    /**
+     * @param userId 用户id
+     * @param actId  活动id
+     * @return com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity
+     * @Author yinzuomei
+     * @Description 根据用户id+活动id活动信息表
+     * @Date 2020/2/6 0:10
+     **/
+    ActUserRelationEntity selectOneByUserIdAndActId(@Param("userId") String userId, @Param("actId") String actId);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java

@@ -166,12 +166,18 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             return new Result().error("活动已报满");
         }
         //查询是否已报名
-        int data = baseDao.isSignUp(actUserRelationDTO.getUserId(), actUserRelationDTO.getActId());
-        if (data == 0) {
+        ActUserRelationEntity actUserRelationEntity = baseDao.selectOneByUserIdAndActId(actUserRelationDTO.getUserId(), actUserRelationDTO.getActId());
+        if (null == actUserRelationEntity || (ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus())
+                && ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()))) {
             //未报名该活动，进行报名
             //存储活动人员关系表
             ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class);
-            insert(entity);
+            if (null != actUserRelationEntity) {
+                entity.setId(actUserRelationEntity.getId());
+                baseDao.updateById(entity);
+            } else {
+                insert(entity);
+            }
             //存储活动日志表
             ActUserLogDTO actUserLogDTO = new ActUserLogDTO();
             actUserLogDTO.setActUserRelationId(entity.getId());

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml

@@ -229,11 +229,20 @@
         </foreach>
     </select>
 
-    <select id="selectListActUserInfo" resultType="com.elink.esua.epdc.activity.ActUserRelationDTO" parameterType="String">
+    <select id="selectListActUserInfo" resultType="com.elink.esua.epdc.activity.ActUserRelationDTO"
+            parameterType="String">
         select ID,ACT_ID,USER_ID,FACE_IMG,NICKNAME,REAL_NAME,PARTY_FLAG
         from epdc_act_user_relation
         where ACT_ID = #{actId}
         and status = '0'
     </select>
 
+    <!--  根据用户id+活动id活动信息表  -->
+    <select id="selectOneByUserIdAndActId" parameterType="map"
+            resultType="com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity">
+        select * from epdc_act_user_relation eaur
+        where eaur.DEL_FLAG='0'
+        and eaur.ACT_ID=#{actId}
+        and eaur.USER_ID=#{userId}
+    </select>
 </mapper>