|
@@ -5,13 +5,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.fdkankan.manage_jp.common.PageInfo;
|
|
import com.fdkankan.manage_jp.common.PageInfo;
|
|
import com.fdkankan.manage_jp.common.ResultCode;
|
|
import com.fdkankan.manage_jp.common.ResultCode;
|
|
import com.fdkankan.manage_jp.entity.Project;
|
|
import com.fdkankan.manage_jp.entity.Project;
|
|
|
|
+import com.fdkankan.manage_jp.entity.ProjectNum;
|
|
import com.fdkankan.manage_jp.entity.User;
|
|
import com.fdkankan.manage_jp.entity.User;
|
|
import com.fdkankan.manage_jp.exception.BusinessException;
|
|
import com.fdkankan.manage_jp.exception.BusinessException;
|
|
import com.fdkankan.manage_jp.mapper.IProjectMapper;
|
|
import com.fdkankan.manage_jp.mapper.IProjectMapper;
|
|
import com.fdkankan.manage_jp.service.ICompanyService;
|
|
import com.fdkankan.manage_jp.service.ICompanyService;
|
|
|
|
+import com.fdkankan.manage_jp.service.IProjectNumService;
|
|
import com.fdkankan.manage_jp.service.IProjectService;
|
|
import com.fdkankan.manage_jp.service.IProjectService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fdkankan.manage_jp.service.IUserService;
|
|
import com.fdkankan.manage_jp.service.IUserService;
|
|
|
|
+import com.fdkankan.manage_jp.vo.request.ProjectAddSceneParam;
|
|
import com.fdkankan.manage_jp.vo.request.ProjectParam;
|
|
import com.fdkankan.manage_jp.vo.request.ProjectParam;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.poi.util.StringUtil;
|
|
import org.apache.poi.util.StringUtil;
|
|
@@ -19,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
+import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -37,6 +41,8 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
ICompanyService companyService;
|
|
ICompanyService companyService;
|
|
@Autowired
|
|
@Autowired
|
|
IUserService userService;
|
|
IUserService userService;
|
|
|
|
+ @Autowired
|
|
|
|
+ IProjectNumService projectNumService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Object pageList(ProjectParam param) {
|
|
public Object pageList(ProjectParam param) {
|
|
@@ -66,6 +72,7 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
if(param.getId() == null){
|
|
if(param.getId() == null){
|
|
throw new BusinessException(ResultCode.PARAM_ERROR);
|
|
throw new BusinessException(ResultCode.PARAM_ERROR);
|
|
}
|
|
}
|
|
|
|
+ projectNumService.delByProjectId(param.getId());
|
|
this.removeById(param.getId());
|
|
this.removeById(param.getId());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -81,4 +88,40 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
|
|
wrapper.in(Project::getCreateId,userIds);
|
|
wrapper.in(Project::getCreateId,userIds);
|
|
return this.list(wrapper);
|
|
return this.list(wrapper);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void addScene(ProjectAddSceneParam param) {
|
|
|
|
+ if(param.getProjectId() == null || param.getNumList() == null || param.getNumList().isEmpty()){
|
|
|
|
+ throw new BusinessException(ResultCode.PARAM_ERROR);
|
|
|
|
+ }
|
|
|
|
+ Project project = this.getById(param.getProjectId());
|
|
|
|
+ if(project == null){
|
|
|
|
+ throw new BusinessException(ResultCode.PROJECT_NOT_EXITS);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ List<ProjectNum> projectNums = projectNumService.getByProjectId(Arrays.asList(param.getProjectId()));
|
|
|
|
+ List<String> dbNumList = projectNums.stream().map(ProjectNum::getNum).collect(Collectors.toList());
|
|
|
|
+ List<String> numList = param.getNumList();
|
|
|
|
+
|
|
|
|
+ List<String> addNumList = numList.stream().filter(e -> !dbNumList.contains(e)).collect(Collectors.toList());
|
|
|
|
+ List<String> delNumList = dbNumList.stream().filter(e -> !numList.contains(e)).collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+ projectNumService.delNumList(param.getProjectId(),delNumList);
|
|
|
|
+ projectNumService.addNumList(param.getProjectId(),addNumList);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void delScene(ProjectAddSceneParam param) {
|
|
|
|
+ if(param.getProjectId() == null || param.getNumList() == null || param.getNumList().isEmpty()){
|
|
|
|
+ throw new BusinessException(ResultCode.PARAM_ERROR);
|
|
|
|
+ }
|
|
|
|
+ Project project = this.getById(param.getProjectId());
|
|
|
|
+ if(project == null){
|
|
|
|
+ throw new BusinessException(ResultCode.PROJECT_NOT_EXITS);
|
|
|
|
+ }
|
|
|
|
+ projectNumService.delNumList(param.getProjectId(),param.getNumList());
|
|
|
|
+
|
|
|
|
+ }
|
|
}
|
|
}
|