Browse Source

关闭活动

dev_shibei_match
yinzuomei 4 years ago
parent
commit
fc6522dc44
  1. 27
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CloseGroupActFormDTO.java
  2. 17
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
  3. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java
  4. 8
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
  5. 5
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
  6. 56
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

27
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CloseGroupActFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.resi.group.dto.act.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 017关闭活动
*
* @author yinzuomei@elink-cn.com
* @date 2021/4/21 15:18
*/
@Data
public class CloseGroupActFormDTO implements Serializable {
public interface AddUserInternalGroup {
}
@NotBlank(message = "groupActId不能为空", groups = ActSummaryDetailFormDTO.AddUserInternalGroup.class)
private String groupActId;
/**
* 当前用户id
*/
@NotBlank(message = "tokenDto获取userId为空", groups = ActReadViewFormDTO.AddUserInternalGroup.class)
private String userId;
}

17
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java

@ -122,4 +122,21 @@ public class GroupActInfoController {
ValidatorUtils.validateEntity(formDTO,ActDetailByLinkFormDTO.AddUserInternalGroup.class);
return new Result<ActDetailByLinkResultDTO>().ok(groupActInfoService.queryActDetailByLink(formDTO));
}
/**
* @return com.epmet.commons.tools.utils.Result
* @param tokenDto
* @param formDTO
* @author yinzuomei
* @description 017关闭活动
* @Date 2021/4/21 15:22
**/
@PostMapping("close")
public Result closeAct(@LoginUser TokenDto tokenDto,@RequestBody CloseGroupActFormDTO formDTO){
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,CloseGroupActFormDTO.AddUserInternalGroup.class);
groupActInfoService.closeAct(formDTO);
return new Result();
}
}

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java

@ -59,4 +59,6 @@ public interface ActSummaryService extends BaseService<ActSummaryEntity> {
* @return com.epmet.resi.group.dto.act.result.ActSummaryDetailResultDTO
*/
ActSummaryDetailResultDTO queryActSummaryDetail(ActSummaryDetailFormDTO formDTO);
ActSummaryEntity queryUserSummary(String groupActId, String userId);
}

8
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java

@ -81,4 +81,12 @@ public interface GroupActInfoService extends BaseService<GroupActInfoEntity> {
* @return com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO
*/
ActDetailByLinkResultDTO queryActDetailByLink(ActDetailByLinkFormDTO formDTO);
/**
* 017关闭活动
*
* @param formDTO
* @return
*/
void closeAct(CloseGroupActFormDTO formDTO);
}

5
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java

@ -296,4 +296,9 @@ public class ActSummaryServiceImpl extends BaseServiceImpl<ActSummaryDao, ActSum
resultDTO.setExtraTextList(actSummaryContentDao.selectContentList(actSummaryEntity.getId(), formDTO.getGroupActId(), GroupActConstant.TEXT));
return resultDTO;
}
@Override
public ActSummaryEntity queryUserSummary(String groupActId, String userId) {
return baseDao.selectUserSummary(groupActId,userId);
}
}

56
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@ -41,16 +41,11 @@ import com.epmet.dto.result.UserBaseInfoResultDTO;
import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.modules.act.dao.ActOperationRecordDao;
import com.epmet.modules.act.dao.ActReadRecordDao;
import com.epmet.modules.act.dao.GroupActContentDao;
import com.epmet.modules.act.dao.GroupActInfoDao;
import com.epmet.modules.act.entity.ActOperationRecordEntity;
import com.epmet.modules.act.entity.ActReadRecordEntity;
import com.epmet.modules.act.entity.GroupActContentEntity;
import com.epmet.modules.act.entity.GroupActInfoEntity;
import com.epmet.modules.act.dao.*;
import com.epmet.modules.act.entity.*;
import com.epmet.modules.act.service.ActCategoryDictService;
import com.epmet.modules.act.service.ActSignInRecordService;
import com.epmet.modules.act.service.ActSummaryService;
import com.epmet.modules.act.service.GroupActInfoService;
import com.epmet.modules.constant.GroupActConstant;
import com.epmet.modules.constant.UserMessageConstant;
@ -118,7 +113,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
@Autowired
private InvitationRecordService invitationRecordService;
@Autowired
private ActSummaryService actSummaryService;
/**
* 003发布编辑组织活动
*
@ -706,4 +702,46 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
resultDTO.setInvitationRecordId(formDTO.getInvitationRecordId());
return resultDTO;
}
/**
* 017关闭活动
*
* @param formDTO
* @return
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void closeAct(CloseGroupActFormDTO formDTO) {
GroupActInfoEntity actInfoEntity=baseDao.selectById(formDTO.getGroupActId());
//1、只有组长才可以关闭活动
ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getLeaderMember(actInfoEntity.getGroupId());
if (!formDTO.getUserId().equals(groupMemberDTO.getCustomerUserId())) {
throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode(), EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg());
}
//2、活动已关闭,已取消,不能关闭
if (GroupActConstant.CLOSED.equals(actInfoEntity.getStatus())) {
throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
} else if (GroupActConstant.CANCELED.equals(actInfoEntity.getStatus())) {
throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
}
ActSummaryEntity actSummaryEntity = actSummaryService.queryUserSummary(formDTO.getGroupActId(),formDTO.getUserId());
//3、没有填写总结,自动提交默认总结
if (actInfoEntity.getSummaryFlag() == NumConstant.ZERO && null == actSummaryEntity) {
ActSummaryFormDTO actSummaryFormDTO=new ActSummaryFormDTO();
actSummaryFormDTO.setUserId(formDTO.getUserId());
actSummaryFormDTO.setGroupActId(formDTO.getGroupActId());
actSummaryService.submitActSummary(actSummaryFormDTO);
}
//4、插入操作日志
ActOperationRecordEntity actOperationRecordEntity = new ActOperationRecordEntity();
actOperationRecordEntity.setCustomerId(actInfoEntity.getCustomerId());
actOperationRecordEntity.setOperateUserId(formDTO.getUserId());
actOperationRecordEntity.setGroupActId(formDTO.getGroupActId());
actOperationRecordEntity.setOperationType(GroupActConstant.CLOSE);
actOperationRecordDao.insert(actOperationRecordEntity);
//5、更新关闭时间
actInfoEntity.setStatus(GroupActConstant.CLOSED);
actInfoEntity.setClosedTime(actOperationRecordEntity.getCreatedTime());
baseDao.updateById(actInfoEntity);
}
}
Loading…
Cancel
Save