From 6f83776e2cbab3bd9f8d8f05fe465b4e649ffb0d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 24 Jul 2020 11:15:25 +0800 Subject: [PATCH] =?UTF-8?q?heart-work:=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gActUserFormDTO.java => ActIdFormDTO.java} | 11 ++++--- .../controller/GrantPointsController.java | 7 ++++ .../controller/WorkActUserController.java | 33 +++++++++---------- .../com/epmet/service/WorkActUserService.java | 17 ++++------ .../service/impl/WorkActUserServiceImpl.java | 17 ++++------ 5 files changed, 42 insertions(+), 43 deletions(-) rename epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/{AuditingActUserFormDTO.java => ActIdFormDTO.java} (50%) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditingActUserFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActIdFormDTO.java similarity index 50% rename from epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditingActUserFormDTO.java rename to epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActIdFormDTO.java index 9fb58c8179..632b567c11 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditingActUserFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActIdFormDTO.java @@ -6,18 +6,19 @@ import javax.validation.constraints.NotBlank; import java.io.Serializable; /** - * 报名审核-待审核列表入参 + * 活动id通用formdto * * @author yinzuomei@elink-cn.com - * @date 2020/7/21 22:12 + * @date 2020/7/24 11:07 */ @Data -public class AuditingActUserFormDTO implements Serializable { - private static final long serialVersionUID = 3811387419859675753L; +public class ActIdFormDTO implements Serializable { + private static final long serialVersionUID = 7151533863877527886L; + public interface AddUserInternalGroup {} /** * 活动id */ - @NotBlank(message = "活动id不能为空", groups = { AddUserInternalGroup.class }) + @NotBlank(message = "活动id不能为空", groups = { ActIdFormDTO.AddUserInternalGroup.class }) private String actId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/GrantPointsController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/GrantPointsController.java index f28d58a269..aec0849ddd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/GrantPointsController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/GrantPointsController.java @@ -1,5 +1,7 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.Result; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,4 +14,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("grantpoints") public class GrantPointsController { + @PostMapping("pendinglist") + public Result queryPendingList(){ + return new Result(); + } + } 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 ff87861170..d7d1d0eb2e 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 @@ -2,10 +2,7 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.work.AactUserDetailFormDTO; -import com.epmet.dto.form.work.AuditUserFormDTO; -import com.epmet.dto.form.work.AuditingActUserFormDTO; -import com.epmet.dto.form.work.UserHistoricalActFormDTO; +import com.epmet.dto.form.work.*; import com.epmet.dto.result.work.*; import com.epmet.service.WorkActUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -37,8 +34,8 @@ public class WorkActUserController { * @Date 2020/7/21 22:24 **/ @PostMapping("auditinglist") - public Result> getAuditingList(@RequestBody AuditingActUserFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + public Result> getAuditingList(@RequestBody ActIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class); return new Result>().ok(workActUserService.getAuditingList(formDTO)); } @@ -51,8 +48,8 @@ public class WorkActUserController { * @Date 2020/7/22 15:16 **/ @PostMapping("passedlist") - public Result> getPassedList(@RequestBody AuditingActUserFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + public Result> getPassedList(@RequestBody ActIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class); return new Result>().ok(workActUserService.getPassedList(formDTO)); } @@ -64,8 +61,8 @@ public class WorkActUserController { * @Date 2020/7/22 15:49 **/ @PostMapping("rejectedlist") - public Result> getRejectedlist(@RequestBody AuditingActUserFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + public Result> getRejectedlist(@RequestBody ActIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class); return new Result>().ok(workActUserService.getRejectedlist(formDTO)); } @@ -77,8 +74,8 @@ public class WorkActUserController { * @Date 2020/7/22 16:23 **/ @PostMapping("canceledlist") - public Result> getCanceledList(@RequestBody AuditingActUserFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + public Result> getCanceledList(@RequestBody ActIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class); return new Result>().ok(workActUserService.getCanceledList(formDTO)); } @@ -90,8 +87,8 @@ public class WorkActUserController { * @Date 2020/7/22 16:43 **/ @PostMapping("signupstat") - public Result getActSignUpStat(@RequestBody AuditingActUserFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + public Result getActSignUpStat(@RequestBody ActIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class); return new Result().ok(workActUserService.getActSignUpStat(formDTO.getActId())); } @@ -157,8 +154,8 @@ public class WorkActUserController { * @Date 2020/7/24 10:17 **/ @PostMapping("joinuserlist") - public Result> queryJoinUserList(@RequestBody AuditingActUserFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + public Result> queryJoinUserList(@RequestBody ActIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class); return new Result>().ok(workActUserService.queryJoinUserList(formDTO)); } @@ -170,8 +167,8 @@ public class WorkActUserController { * @Date 2020/7/24 10:53 **/ @PostMapping("canceleduserlist") - public Result> queryCanceledUserList(@RequestBody AuditingActUserFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); + public Result> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class); return new Result>().ok(workActUserService.queryCanceledUserList(formDTO)); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java index 035f4792a3..bcd3807014 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java @@ -1,9 +1,6 @@ package com.epmet.service; -import com.epmet.dto.form.work.AactUserDetailFormDTO; -import com.epmet.dto.form.work.AuditUserFormDTO; -import com.epmet.dto.form.work.AuditingActUserFormDTO; -import com.epmet.dto.form.work.UserHistoricalActFormDTO; +import com.epmet.dto.form.work.*; import com.epmet.dto.result.work.*; import java.util.List; @@ -22,7 +19,7 @@ public interface WorkActUserService { * @description 报名审核-待审核列表 * @Date 2020/7/21 22:25 **/ - List getAuditingList(AuditingActUserFormDTO formDTO); + List getAuditingList(ActIdFormDTO formDTO); /** * @return java.util.List @@ -31,7 +28,7 @@ public interface WorkActUserService { * @description 报名审核-已通过列表 * @Date 2020/7/22 15:16 **/ - List getPassedList(AuditingActUserFormDTO formDTO); + List getPassedList(ActIdFormDTO formDTO); /** * @return java.util.List @@ -40,7 +37,7 @@ public interface WorkActUserService { * @description 报名审核-已拒绝列表 * @Date 2020/7/22 15:50 **/ - List getRejectedlist(AuditingActUserFormDTO formDTO); + List getRejectedlist(ActIdFormDTO formDTO); /** * @return java.util.List @@ -49,7 +46,7 @@ public interface WorkActUserService { * @description 报名审核-已取消报名列表 * @Date 2020/7/22 16:35 **/ - List getCanceledList(AuditingActUserFormDTO formDTO); + List getCanceledList(ActIdFormDTO formDTO); /** * @return com.epmet.dto.result.work.ActSignUpStatResultDTO @@ -103,7 +100,7 @@ public interface WorkActUserService { * @description 已结束-已参加人员列表 * @Date 2020/7/24 10:17 **/ - List queryJoinUserList(AuditingActUserFormDTO formDTO); + List queryJoinUserList(ActIdFormDTO formDTO); /** * @return java.util.List @@ -112,5 +109,5 @@ public interface WorkActUserService { * @description 已结束-已取消报名人员列表 * @Date 2020/7/24 10:54 **/ - List queryCanceledUserList(AuditingActUserFormDTO formDTO); + List queryCanceledUserList(ActIdFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 0061c0186b..6d6c81157a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -16,10 +16,7 @@ import com.epmet.dto.ActUserLogDTO; import com.epmet.dto.ActUserRelationDTO; import com.epmet.dto.HeartUserInfoDTO; import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.dto.form.work.AactUserDetailFormDTO; -import com.epmet.dto.form.work.AuditUserFormDTO; -import com.epmet.dto.form.work.AuditingActUserFormDTO; -import com.epmet.dto.form.work.UserHistoricalActFormDTO; +import com.epmet.dto.form.work.*; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.work.*; import com.epmet.entity.ActInfoEntity; @@ -72,7 +69,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { * @Date 2020/7/21 22:25 **/ @Override - public List getAuditingList(AuditingActUserFormDTO formDTO) { + public List getAuditingList(ActIdFormDTO formDTO) { List list=new ArrayList<>(); //查询出待审核的人员列表 List actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_AUDITING); @@ -114,7 +111,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { * @Date 2020/7/22 15:16 **/ @Override - public List getPassedList(AuditingActUserFormDTO formDTO) { + public List getPassedList(ActIdFormDTO formDTO) { List resultList=new ArrayList<>(); //查询已通过的人员列表 List actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED); @@ -157,7 +154,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { * @Date 2020/7/22 15:50 **/ @Override - public List getRejectedlist(AuditingActUserFormDTO formDTO) { + public List getRejectedlist(ActIdFormDTO formDTO) { List resultList=new ArrayList<>(); //查询已拒绝的人员列表 List actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_REFUSED); @@ -201,7 +198,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { * @Date 2020/7/22 16:35 **/ @Override - public List getCanceledList(AuditingActUserFormDTO formDTO) { + public List getCanceledList(ActIdFormDTO formDTO) { List resultList=new ArrayList<>(); //查询已取消的人员列表 List actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_CANCELD); @@ -442,7 +439,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { * @Date 2020/7/24 10:17 **/ @Override - public List queryJoinUserList(AuditingActUserFormDTO formDTO) { + public List queryJoinUserList(ActIdFormDTO formDTO) { List list=actInfoDao.queryJoinUserList(formDTO.getActId()); if(null!=list&&list.size()>0){ //查询已通过审核的人员id集合 @@ -481,7 +478,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { * @Date 2020/7/24 10:54 **/ @Override - public List queryCanceledUserList(AuditingActUserFormDTO formDTO) { + public List queryCanceledUserList(ActIdFormDTO formDTO) { List list=actInfoDao.queryCanceledUserList(formDTO.getActId()); if(null!=list&&list.size()>0){ //查询已取消报名的人员id集合