Browse Source

解决活动报名,审核拒绝时。活动状态错误问题。

ftature/screen
zhangyongzhangyong 4 years ago
parent
commit
b739b6e7c3
  1. 11
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java
  2. 11
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java
  3. 6
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java
  4. 3
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
  5. 20
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml

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

@ -95,4 +95,15 @@ public interface ActPeriodDao extends BaseDao<ActPeriodEntity> {
* @Date 14:29 2021-10-08
**/
void minusPeriodSignUpNum(@Param("periodIds") List<String> periodIds);
/**
* 获取该活动中我报名的活动时间段
*
* @param actId
* @param actUserRelationId
* @return java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>
* @author zy
* @since 2021/9/2 16:13
*/
List<ActPeriodDTO> selectListOfActPeriodsByActIdAndActUserRelationId(@Param("actId") String actId, @Param("actUserRelationId") String actUserRelationId);
}

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

@ -113,6 +113,17 @@ public interface ActPeriodService extends BaseService<ActPeriodEntity> {
*/
List<ActPeriodDTO> listOfActPeriodsByActId(String actId);
/**
* 获取该活动中我报名的活动时间段
*
* @param actId
* @param actUserRelationId
* @return java.util.List<com.elink.esua.epdc.activity.ActPeriodDTO>
* @author zy
* @since 2021/9/2 16:13
*/
List<ActPeriodDTO> listOfActPeriodsByActIdAndActUserRelationId(String actId, String actUserRelationId);
/**
* 根据活动id查询该活动存在几条活动时间段
* 如果是老数据则为 0

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

@ -122,6 +122,12 @@ public class ActPeriodServiceImpl extends BaseServiceImpl<ActPeriodDao, ActPerio
return data;
}
@Override
public List<ActPeriodDTO> listOfActPeriodsByActIdAndActUserRelationId(String actId, String actUserRelationId) {
List<ActPeriodDTO> data = baseDao.selectListOfActPeriodsByActIdAndActUserRelationId(actId, actUserRelationId);
return data;
}
@Override
public Integer getPeriodNumberByActId(String actId) {
return baseDao.getPeriodNumberByActId(actId);

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

@ -186,7 +186,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
if (ActStateConstant.ACT_USER_RELATION_STATUS_AUDITREJECT.equals(dto.getStatus())) {
actInfoService.minusSignUpNum(entity.getActId());
List<ActPeriodDTO> signUpPeriodsByActId = actPeriodService.listOfActPeriodsByActId(entity.getActId());
// 审核不通过,把我在这个活动中,报名的所有时间段都取消。
List<ActPeriodDTO> signUpPeriodsByActId = actPeriodService.listOfActPeriodsByActIdAndActUserRelationId(entity.getActId(), dto.getId());
List<String> periodIds = new ArrayList<>();
for (ActPeriodDTO period : signUpPeriodsByActId) {
periodIds.add(period.getId());

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

@ -82,4 +82,24 @@
#{periodId}
</foreach>
</update>
<select id="selectListOfActPeriodsByActIdAndActUserRelationId" resultType="com.elink.esua.epdc.activity.ActPeriodDTO">
SELECT
P.ID,
P.ACT_ID,
P.ACT_PERIOD_START_TIME,
P.ACT_PERIOD_END_TIME,
P.ACT_PERIOD_QUOTA,
COUNT(pu.ID) actPeriodSignUpNum,
p.ACT_PERIOD_QUOTA_CATEGORY actPeriodQuotaCategory
FROM
epdc_act_period P
LEFT JOIN epdc_act_period_user pu ON p.ID = pu.ACT_PERIOD_ID AND pu.DEL_FLAG ='0' AND pu.PERIOD_STATUS NOT IN ('3', '4')
WHERE
P.DEL_FLAG = '0'
AND P.ACT_ID = #{actId}
AND pu.ACT_USER_RELATION_ID = #{actUserRelationId}
GROUP BY p.ID
ORDER BY P.ACT_PERIOD_START_TIME
</select>
</mapper>

Loading…
Cancel
Save