diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditUserFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditUserFormDTO.java index 0df68ec7a8..f10fa57149 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditUserFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditUserFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form.work; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -12,6 +13,7 @@ import java.io.Serializable; * @author yinzuomei@elink-cn.com * @date 2020/7/23 17:28 */ +@Valid @Data public class AuditUserFormDTO implements Serializable { private static final long serialVersionUID = 243279409415285207L; @@ -28,4 +30,7 @@ public class AuditUserFormDTO implements Serializable { @NotBlank(message = "拒绝理由不能为空", groups = {RefusedUserShowGroup.class}) private String rejectReason; + @NotBlank(message = "type不能为空【通过:pass;拒绝:refused】", groups = {AddUserInternalGroup.class}) + private String type; + } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActUserResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActUserResDTO.java index 01fcf7e293..17b09b3687 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActUserResDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActUserResDTO.java @@ -87,6 +87,18 @@ public class ActUserResDTO implements Serializable { * 已给分:agree, 不给分:deny 默认"" */ private String rewardFlag; + + + /** + * 当前状态(已报名/待审核auditing, + 审核通过passed, + 审核不通过refused + 取消报名canceled, + ) + */ + private String status; + + public ActUserResDTO(){ this.signInActNum=0; this.signUpActNum=0; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java index e1b4eca9c0..41f5b456eb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java @@ -3,6 +3,7 @@ package com.epmet.controller; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.ActConstant; import com.epmet.dto.form.work.AactUserDetailFormDTO; import com.epmet.dto.form.work.ActIdFormDTO; import com.epmet.dto.form.work.AuditUserFormDTO; @@ -131,6 +132,7 @@ public class WorkActUserController { **/ @PostMapping("auditpass") public Result auditPass(@RequestBody AuditUserFormDTO formDTO){ + formDTO.setType(ActConstant.ACT_USER_STATUS_PASSED); ValidatorUtils.validateEntity(formDTO, AuditUserFormDTO.AddUserInternalGroup.class); workActUserService.auditPass(formDTO.getActUserRelationId()); return new Result(); @@ -145,6 +147,7 @@ public class WorkActUserController { **/ @PostMapping("auditrefuse") public Result auditrefuse(@RequestBody AuditUserFormDTO formDTO){ + formDTO.setType(ActConstant.ACT_USER_STATUS_REFUSED); ValidatorUtils.validateEntity(formDTO, AuditUserFormDTO.RefusedUserShowGroup.class); workActUserService.auditRefuse(formDTO); return new Result(); @@ -186,5 +189,23 @@ public class WorkActUserController { return new Result>().ok(workActUserService.queryUserList(formDTO.getActId())); } + /** + * 批量审核通过、拒绝调用原来的接口 + * @param formDTOList + * @return + */ + @PostMapping("audit-user") + public Result auditUser(@RequestBody List formDTOList) { + ValidatorUtils.validateEntity(formDTOList); + for (AuditUserFormDTO formDTO : formDTOList) { + if (ActConstant.ACT_USER_STATUS_REFUSED.equals(formDTO.getType())) { + workActUserService.auditRefuse(formDTO); + } else if (ActConstant.ACT_USER_STATUS_PASSED.equals(formDTO.getType())) { + workActUserService.auditPass(formDTO.getActUserRelationId()); + } + } + return new Result(); + } + }