From 42c85609efefd299782e4629a5ef2b3475e21c76 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 21 Aug 2021 10:53:32 +0800
Subject: [PATCH] 考试报名，培训报名，派遣查询接口修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 2 --
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 4 ++--
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 8 ++++----
6 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index c6f1b8b..1003508 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -102,7 +102,7 @@
if (1==user.getIsApply()){
return R.data(201,"已报名，不能重复报名");
}
- if (2==user.getIsApply() || -1==user.getIsApply() || 3==user.getIsApply()){
+ if (1!=user.getIsApply()){
//默认通过
apply.setApplyStatus(2);
//默认为未考试状态
@@ -430,7 +430,7 @@
return R.data(200,"取消报名成功");
}
}else {
- if (user.getIsApply()==2) {
+ if (user.getIsApply()!=1) {
return R.data(201,"尚未报名");
}
if(user.getIsApply()==1){
@@ -471,7 +471,7 @@
user.setIsApply(1);
userService.updateById(user);
} else {
- if (user.getIsApply() == 2 || -1==user.getIsApply() || 3==user.getIsApply()) {
+ if (user.getIsApply() != 1) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -504,7 +504,7 @@
user.setIsApply(1);
userService.updateById(user);
} else {
- if (user.getIsApply() == 2 || -1==user.getIsApply() || 3==user.getIsApply()) {
+ if (user.getIsApply() != 1) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index 3e29119..1cbeef8 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -117,7 +117,7 @@
user1.setIsApply(1);
userService.updateById(user1);
}else {
- if (user1.getIsApply()==2 || -1==user.getIsApply() || 3==user.getIsApply()) {
+ if (user1.getIsApply()!=1) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
index c1a5093..bc6e380 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -134,7 +134,6 @@
//查询派遣单位的信息,设置行政区
dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
}
- //arg.test01(arg.url+"/dispatcher/save",dispatcher);
}
else {
if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
@@ -151,7 +150,6 @@
//查询派遣单位的信息,设置行政区
dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
}
- //arg.test01(arg.url+"/dispatcher/update",dispatcher);
}
return R.status(dispatcherService.saveOrUpdate(dispatcher));
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java
index 41e85d9..9783734 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java
@@ -16,13 +16,18 @@
*/
package org.springblade.modules.dispatcher.service.impl;
+import lombok.AllArgsConstructor;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.dispatcher.mapper.DispatcherMapper;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
/**
* 服务实现类
@@ -31,11 +36,35 @@
* @since 2021-07-07
*/
@Service
+@AllArgsConstructor
public class DispatcherServiceImpl extends ServiceImpl<DispatcherMapper, Dispatcher> implements IDispatcherService {
+
+ private final IUserService userService;
@Override
public IPage<DispatcherVO> selectDispatcherPage(IPage<DispatcherVO> page, DispatcherVO dispatcher) {
- return page.setRecords(baseMapper.selectDispatcherPage(page, dispatcher));
+ List<DispatcherVO> dispatcherVOS = baseMapper.selectDispatcherPage(page, dispatcher);
+ if (dispatcherVOS.size()>0){
+ dispatcherVOS.forEach(dispatcherVO -> {
+ String userIds = dispatcherVO.getUserIds();
+ if (!userIds.isEmpty()){
+ String[] userIdArray = userIds.split(",");
+ if (userIdArray.length>0) {
+ StringBuilder builder = new StringBuilder();
+ //查询用户信息
+ for (String userId : userIdArray) {
+ User user = userService.getById(userId);
+ if (null != user) {
+ builder.append(user.getRealName()).append(",");
+ }
+ }
+ String s = builder.toString();
+ dispatcherVO.setSecurityName(s.substring(0,s.length()-1));
+ }
+ }
+ });
+ }
+ return page.setRecords(dispatcherVOS);
}
/**
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 53396b0..0e1036f 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -95,7 +95,7 @@
if (1==user.getIsTrain()){
return R.data(201,"已报名，不能重复报名");
}
- if (2==user.getIsTrain() || -1==user.getIsTrain() || 3==user.getIsTrain()){
+ if (1!=user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
//默认为未考试状态
@@ -173,7 +173,7 @@
user.setIsTrain(1);
userService.updateById(user);
}else {
- if (user.getIsTrain()==2 || -1==user.getIsTrain() || 3==user.getIsTrain()) {
+ if (user.getIsTrain()!=1) {
TrainingRegistration trainingRegistration1 = new TrainingRegistration();
trainingRegistration1.setCancel(1);
//默认为未考试状态
diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index 817f454..f810773 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -95,7 +95,7 @@
user.setIsTrain(1);
userService.updateById(user);
}else {
- if (2 == user.getIsTrain() || -1==user.getIsTrain() || 3==user.getIsTrain()) {
+ if (user.getIsTrain()!=1) {
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
--
Gitblit v1.9.3