rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

heart-work:修改入参

dev
yinzuomei 5 years ago
parent
185c7efca4
commit
6f83776e2c
5 changed files with 42 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActIdFormDTO.java
  2. 7
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/GrantPointsController.java
  3. 33
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java
  4. 17
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java
  5. 17
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

11
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditingActUserFormDTO.java → epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActIdFormDTO.java
View File

@ -6,18 +6,19 @@ import javax.validation.constraints.NotBlank;
import java.io.Serializable; import java.io.Serializable;
/** /**
* 报名审核-待审核列表入参 * 活动id通用formdto
* *
* @author yinzuomei@elink-cn.com * @author yinzuomei@elink-cn.com
* @date 2020/7/21 22:12 * @date 2020/7/24 11:07
*/ */
@Data @Data
public class AuditingActUserFormDTO implements Serializable { public class ActIdFormDTO implements Serializable {
private static final long serialVersionUID = 3811387419859675753L; private static final long serialVersionUID = 7151533863877527886L;
public interface AddUserInternalGroup {} public interface AddUserInternalGroup {}
/** /**
* 活动id * 活动id
*/ */
@NotBlank(message = "活动id不能为空", groups = { AddUserInternalGroup.class }) @NotBlank(message = "活动id不能为空", groups = { ActIdFormDTO.AddUserInternalGroup.class })
private String actId; private String actId;
} }

7
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/GrantPointsController.java
View File

@ -1,5 +1,7 @@
package com.epmet.controller; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -12,4 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("grantpoints") @RequestMapping("grantpoints")
public class GrantPointsController { public class GrantPointsController {
@PostMapping("pendinglist")
public Result queryPendingList(){
return new Result();
}
} }

33
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java
View File

@ -2,10 +2,7 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.work.AactUserDetailFormDTO; import com.epmet.dto.form.work.*;
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.result.work.*; import com.epmet.dto.result.work.*;
import com.epmet.service.WorkActUserService; import com.epmet.service.WorkActUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -37,8 +34,8 @@ public class WorkActUserController {
* @Date 2020/7/21 22:24 * @Date 2020/7/21 22:24
**/ **/
@PostMapping("auditinglist") @PostMapping("auditinglist")
public Result<List<AuditingActUserResultDTO>> getAuditingList(@RequestBody AuditingActUserFormDTO formDTO){ public Result<List<AuditingActUserResultDTO>> getAuditingList(@RequestBody ActIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
return new Result<List<AuditingActUserResultDTO>>().ok(workActUserService.getAuditingList(formDTO)); return new Result<List<AuditingActUserResultDTO>>().ok(workActUserService.getAuditingList(formDTO));
} }
@ -51,8 +48,8 @@ public class WorkActUserController {
* @Date 2020/7/22 15:16 * @Date 2020/7/22 15:16
**/ **/
@PostMapping("passedlist") @PostMapping("passedlist")
public Result<List<PassedActUserResultDTO>> getPassedList(@RequestBody AuditingActUserFormDTO formDTO){ public Result<List<PassedActUserResultDTO>> getPassedList(@RequestBody ActIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
return new Result<List<PassedActUserResultDTO>>().ok(workActUserService.getPassedList(formDTO)); return new Result<List<PassedActUserResultDTO>>().ok(workActUserService.getPassedList(formDTO));
} }
@ -64,8 +61,8 @@ public class WorkActUserController {
* @Date 2020/7/22 15:49 * @Date 2020/7/22 15:49
**/ **/
@PostMapping("rejectedlist") @PostMapping("rejectedlist")
public Result<List<RejectedActUserResultDTO>> getRejectedlist(@RequestBody AuditingActUserFormDTO formDTO){ public Result<List<RejectedActUserResultDTO>> getRejectedlist(@RequestBody ActIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
return new Result<List<RejectedActUserResultDTO>>().ok(workActUserService.getRejectedlist(formDTO)); return new Result<List<RejectedActUserResultDTO>>().ok(workActUserService.getRejectedlist(formDTO));
} }
@ -77,8 +74,8 @@ public class WorkActUserController {
* @Date 2020/7/22 16:23 * @Date 2020/7/22 16:23
**/ **/
@PostMapping("canceledlist") @PostMapping("canceledlist")
public Result<List<CanceledActUserResultDTO>> getCanceledList(@RequestBody AuditingActUserFormDTO formDTO){ public Result<List<CanceledActUserResultDTO>> getCanceledList(@RequestBody ActIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
return new Result<List<CanceledActUserResultDTO>>().ok(workActUserService.getCanceledList(formDTO)); return new Result<List<CanceledActUserResultDTO>>().ok(workActUserService.getCanceledList(formDTO));
} }
@ -90,8 +87,8 @@ public class WorkActUserController {
* @Date 2020/7/22 16:43 * @Date 2020/7/22 16:43
**/ **/
@PostMapping("signupstat") @PostMapping("signupstat")
public Result<ActSignUpStatResultDTO> getActSignUpStat(@RequestBody AuditingActUserFormDTO formDTO){ public Result<ActSignUpStatResultDTO> getActSignUpStat(@RequestBody ActIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
return new Result<ActSignUpStatResultDTO>().ok(workActUserService.getActSignUpStat(formDTO.getActId())); return new Result<ActSignUpStatResultDTO>().ok(workActUserService.getActSignUpStat(formDTO.getActId()));
} }
@ -157,8 +154,8 @@ public class WorkActUserController {
* @Date 2020/7/24 10:17 * @Date 2020/7/24 10:17
**/ **/
@PostMapping("joinuserlist") @PostMapping("joinuserlist")
public Result<List<JoinedUserResultDTO>> queryJoinUserList(@RequestBody AuditingActUserFormDTO formDTO){ public Result<List<JoinedUserResultDTO>> queryJoinUserList(@RequestBody ActIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
return new Result<List<JoinedUserResultDTO>>().ok(workActUserService.queryJoinUserList(formDTO)); return new Result<List<JoinedUserResultDTO>>().ok(workActUserService.queryJoinUserList(formDTO));
} }
@ -170,8 +167,8 @@ public class WorkActUserController {
* @Date 2020/7/24 10:53 * @Date 2020/7/24 10:53
**/ **/
@PostMapping("canceleduserlist") @PostMapping("canceleduserlist")
public Result<List<CanceledUserResultDTO>> queryCanceledUserList(@RequestBody AuditingActUserFormDTO formDTO){ public Result<List<CanceledUserResultDTO>> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AuditingActUserFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
return new Result<List<CanceledUserResultDTO>>().ok(workActUserService.queryCanceledUserList(formDTO)); return new Result<List<CanceledUserResultDTO>>().ok(workActUserService.queryCanceledUserList(formDTO));
} }
} }

17
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java
View File

@ -1,9 +1,6 @@
package com.epmet.service; package com.epmet.service;
import com.epmet.dto.form.work.AactUserDetailFormDTO; import com.epmet.dto.form.work.*;
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.result.work.*; import com.epmet.dto.result.work.*;
import java.util.List; import java.util.List;
@ -22,7 +19,7 @@ public interface WorkActUserService {
* @description 报名审核-待审核列表 * @description 报名审核-待审核列表
* @Date 2020/7/21 22:25 * @Date 2020/7/21 22:25
**/ **/
List<AuditingActUserResultDTO> getAuditingList(AuditingActUserFormDTO formDTO); List<AuditingActUserResultDTO> getAuditingList(ActIdFormDTO formDTO);
/** /**
* @return java.util.List<com.epmet.dto.result.work.PassedActUserResultDTO> * @return java.util.List<com.epmet.dto.result.work.PassedActUserResultDTO>
@ -31,7 +28,7 @@ public interface WorkActUserService {
* @description 报名审核-已通过列表 * @description 报名审核-已通过列表
* @Date 2020/7/22 15:16 * @Date 2020/7/22 15:16
**/ **/
List<PassedActUserResultDTO> getPassedList(AuditingActUserFormDTO formDTO); List<PassedActUserResultDTO> getPassedList(ActIdFormDTO formDTO);
/** /**
* @return java.util.List<com.epmet.dto.result.work.RejectedActUserResultDTO> * @return java.util.List<com.epmet.dto.result.work.RejectedActUserResultDTO>
@ -40,7 +37,7 @@ public interface WorkActUserService {
* @description 报名审核-已拒绝列表 * @description 报名审核-已拒绝列表
* @Date 2020/7/22 15:50 * @Date 2020/7/22 15:50
**/ **/
List<RejectedActUserResultDTO> getRejectedlist(AuditingActUserFormDTO formDTO); List<RejectedActUserResultDTO> getRejectedlist(ActIdFormDTO formDTO);
/** /**
* @return java.util.List<com.epmet.dto.result.work.CanceledActUserResultDTO> * @return java.util.List<com.epmet.dto.result.work.CanceledActUserResultDTO>
@ -49,7 +46,7 @@ public interface WorkActUserService {
* @description 报名审核-已取消报名列表 * @description 报名审核-已取消报名列表
* @Date 2020/7/22 16:35 * @Date 2020/7/22 16:35
**/ **/
List<CanceledActUserResultDTO> getCanceledList(AuditingActUserFormDTO formDTO); List<CanceledActUserResultDTO> getCanceledList(ActIdFormDTO formDTO);
/** /**
* @return com.epmet.dto.result.work.ActSignUpStatResultDTO * @return com.epmet.dto.result.work.ActSignUpStatResultDTO
@ -103,7 +100,7 @@ public interface WorkActUserService {
* @description 已结束-已参加人员列表 * @description 已结束-已参加人员列表
* @Date 2020/7/24 10:17 * @Date 2020/7/24 10:17
**/ **/
List<JoinedUserResultDTO> queryJoinUserList(AuditingActUserFormDTO formDTO); List<JoinedUserResultDTO> queryJoinUserList(ActIdFormDTO formDTO);
/** /**
* @return java.util.List<com.epmet.dto.result.work.CanceledUserResultDTO> * @return java.util.List<com.epmet.dto.result.work.CanceledUserResultDTO>
@ -112,5 +109,5 @@ public interface WorkActUserService {
* @description 已结束-已取消报名人员列表 * @description 已结束-已取消报名人员列表
* @Date 2020/7/24 10:54 * @Date 2020/7/24 10:54
**/ **/
List<CanceledUserResultDTO> queryCanceledUserList(AuditingActUserFormDTO formDTO); List<CanceledUserResultDTO> queryCanceledUserList(ActIdFormDTO formDTO);
} }

17
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
View File

@ -16,10 +16,7 @@ import com.epmet.dto.ActUserLogDTO;
import com.epmet.dto.ActUserRelationDTO; import com.epmet.dto.ActUserRelationDTO;
import com.epmet.dto.HeartUserInfoDTO; import com.epmet.dto.HeartUserInfoDTO;
import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO;
import com.epmet.dto.form.work.AactUserDetailFormDTO; import com.epmet.dto.form.work.*;
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.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO;
import com.epmet.dto.result.work.*; import com.epmet.dto.result.work.*;
import com.epmet.entity.ActInfoEntity; import com.epmet.entity.ActInfoEntity;
@ -72,7 +69,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
* @Date 2020/7/21 22:25 * @Date 2020/7/21 22:25
**/ **/
@Override @Override
public List<AuditingActUserResultDTO> getAuditingList(AuditingActUserFormDTO formDTO) { public List<AuditingActUserResultDTO> getAuditingList(ActIdFormDTO formDTO) {
List<AuditingActUserResultDTO> list=new ArrayList<>(); List<AuditingActUserResultDTO> list=new ArrayList<>();
//查询出待审核的人员列表 //查询出待审核的人员列表
List<ActUserRelationDTO> actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_AUDITING); List<ActUserRelationDTO> 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 * @Date 2020/7/22 15:16
**/ **/
@Override @Override
public List<PassedActUserResultDTO> getPassedList(AuditingActUserFormDTO formDTO) { public List<PassedActUserResultDTO> getPassedList(ActIdFormDTO formDTO) {
List<PassedActUserResultDTO> resultList=new ArrayList<>(); List<PassedActUserResultDTO> resultList=new ArrayList<>();
//查询已通过的人员列表 //查询已通过的人员列表
List<ActUserRelationDTO> actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED); List<ActUserRelationDTO> 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 * @Date 2020/7/22 15:50
**/ **/
@Override @Override
public List<RejectedActUserResultDTO> getRejectedlist(AuditingActUserFormDTO formDTO) { public List<RejectedActUserResultDTO> getRejectedlist(ActIdFormDTO formDTO) {
List<RejectedActUserResultDTO> resultList=new ArrayList<>(); List<RejectedActUserResultDTO> resultList=new ArrayList<>();
//查询已拒绝的人员列表 //查询已拒绝的人员列表
List<ActUserRelationDTO> actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_REFUSED); List<ActUserRelationDTO> 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 * @Date 2020/7/22 16:35
**/ **/
@Override @Override
public List<CanceledActUserResultDTO> getCanceledList(AuditingActUserFormDTO formDTO) { public List<CanceledActUserResultDTO> getCanceledList(ActIdFormDTO formDTO) {
List<CanceledActUserResultDTO> resultList=new ArrayList<>(); List<CanceledActUserResultDTO> resultList=new ArrayList<>();
//查询已取消的人员列表 //查询已取消的人员列表
List<ActUserRelationDTO> actUserRelationDTOList=actUserRelationService.getUserList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_CANCELD); List<ActUserRelationDTO> 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 * @Date 2020/7/24 10:17
**/ **/
@Override @Override
public List<JoinedUserResultDTO> queryJoinUserList(AuditingActUserFormDTO formDTO) { public List<JoinedUserResultDTO> queryJoinUserList(ActIdFormDTO formDTO) {
List<JoinedUserResultDTO> list=actInfoDao.queryJoinUserList(formDTO.getActId()); List<JoinedUserResultDTO> list=actInfoDao.queryJoinUserList(formDTO.getActId());
if(null!=list&&list.size()>0){ if(null!=list&&list.size()>0){
//查询已通过审核的人员id集合 //查询已通过审核的人员id集合
@ -481,7 +478,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
* @Date 2020/7/24 10:54 * @Date 2020/7/24 10:54
**/ **/
@Override @Override
public List<CanceledUserResultDTO> queryCanceledUserList(AuditingActUserFormDTO formDTO) { public List<CanceledUserResultDTO> queryCanceledUserList(ActIdFormDTO formDTO) {
List<CanceledUserResultDTO> list=actInfoDao.queryCanceledUserList(formDTO.getActId()); List<CanceledUserResultDTO> list=actInfoDao.queryCanceledUserList(formDTO.getActId());
if(null!=list&&list.size()>0){ if(null!=list&&list.size()>0){
//查询已取消报名的人员id集合 //查询已取消报名的人员id集合

Write Preview
Loading…
Cancel
Save