Merge 推送至业务 #17

Merged
XiaoLFeng merged 46 commits from develop into master 2024-04-17 00:55:37 +08:00
3 changed files with 16 additions and 2 deletions
Showing only changes of commit 3e0652034e - Show all commits

View File

@ -1,5 +1,6 @@
package com.jsl.oa.controllers;
import com.jsl.oa.model.vodata.ProjectEditVO;
import com.jsl.oa.model.vodata.ProjectInfoVO;
import com.jsl.oa.model.vodata.ProjectWorkVO;
import com.jsl.oa.model.vodata.business.info.ProjectShowVO;
import com.jsl.oa.services.ProjectService;
@ -189,6 +190,19 @@ public class ProjectController {
return projectService.projecWorktAdd(request, projectWorkVO);
}
@PostMapping("/project/add")
public BaseResponse projectAdd(HttpServletRequest request,
@RequestBody @Validated ProjectInfoVO projectInfoVO,
@NotNull BindingResult bindingResult) {
log.info("请求接口[POST]: /project/add");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
}
return ResultUtil.success(projectService.projectAdd(request, projectInfoVO));
}
/**
* 获取负责人id
*

View File

@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List;
public interface ProjectService {
BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd);
BaseResponse projectEdit(HttpServletRequest request, ProjectEditVO projectEdit, Long projectId);
@ -27,6 +26,8 @@ public interface ProjectService {
BaseResponse projectDelete(HttpServletRequest request, List<Long> id);
BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectVO);
BaseResponse workget(Integer listAll, HttpServletRequest request,
List<String> tags, List<Integer> isFinish, Integer is, Integer page, Integer pageSize);

View File

@ -15,7 +15,6 @@ import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import static java.lang.System.*;
/**
* <h1>消息服务层实现类</h1>