diff --git a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java index ef53004..330cf47 100644 --- a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java @@ -16,6 +16,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.Date; /** @@ -60,6 +61,17 @@ public class ProjectDailyController { return projectDailyService.getMyDaily(page, pageSize, request); } + + @GetMapping("/daily/search") + public BaseResponse searchMyDaily(@RequestParam Integer page, + @RequestParam Integer pageSize, + Date beginTime, + Date endTime, + HttpServletRequest request) { + return projectDailyService.searchMyDaily(page, pageSize, beginTime, endTime, request); + } + + } diff --git a/src/main/java/com/jsl/oa/model/dodata/ReviewDO.java b/src/main/java/com/jsl/oa/model/dodata/ReviewDO.java index 2280e81..cddbfd1 100644 --- a/src/main/java/com/jsl/oa/model/dodata/ReviewDO.java +++ b/src/main/java/com/jsl/oa/model/dodata/ReviewDO.java @@ -27,7 +27,7 @@ public class ReviewDO { //申请理由 private String content; //申请者用户id - private Long senderId; + private Integer senderId; //审核者用户id private Long recipientId; //审核类别（0：子系统；1：子模块） diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyAddVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyAddVO.java index e13b2bd..3b0a891 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyAddVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyAddVO.java @@ -13,7 +13,7 @@ import java.util.Date; public class ProjectDailyAddVO { @NotNull(message = "项目id不能为空") - private Long projectId; + private Integer projectId; @NotBlank(message = "日报内容不能为空") private String content; diff --git a/src/main/java/com/jsl/oa/model/vodata/ReviewAddVO.java b/src/main/java/com/jsl/oa/model/vodata/ReviewAddVO.java index 25114be..333a67a 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ReviewAddVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ReviewAddVO.java @@ -17,12 +17,12 @@ public class ReviewAddVO { private String content; //申请的项目id @NotNull(message = "项目id不能为空") - private Long projectId; + private Integer projectId; //申请的子系统id @NotNull(message = "子系统id不能为空") - private Long projectChildId; + private Integer projectChildId; //申请的子模块id - private Long projectModuleId; + private Integer projectModuleId; } diff --git a/src/main/java/com/jsl/oa/services/ProjectDailyService.java b/src/main/java/com/jsl/oa/services/ProjectDailyService.java index 6bc3900..4fd44c6 100644 --- a/src/main/java/com/jsl/oa/services/ProjectDailyService.java +++ b/src/main/java/com/jsl/oa/services/ProjectDailyService.java @@ -6,7 +6,7 @@ import com.jsl.oa.model.vodata.ProjectDailyAddVO; import com.jsl.oa.utils.BaseResponse; import javax.servlet.http.HttpServletRequest; - +import java.util.Date; /** @@ -21,6 +21,12 @@ public interface ProjectDailyService { BaseResponse addDaily(ProjectDailyAddVO projectDailyAddVO, HttpServletRequest request); BaseResponse getMyDaily(Integer page, Integer pageSize, HttpServletRequest request); + + BaseResponse searchMyDaily(Integer page, + Integer pageSize, + Date beginTime, + Date endTime, + HttpServletRequest request); } diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java index 03d5b30..3a5e496 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -49,9 +50,9 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { // 获取用户id Long userId = Processing.getAuthHeaderToUserId(request); // 从请求体中获取项目id - Long projectId = projectDailyAddVO.getProjectId(); + Integer projectId = projectDailyAddVO.getProjectId(); // 检查项目是否存在 - if (!projectDAO.isExistProjectById(projectId)) { + if (!projectDAO.isExistProjectById(Long.valueOf(projectId))) { return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); } @@ -86,7 +87,14 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { return ResultUtil.success(projectDailyDataVO); } - + @Override + public BaseResponse searchMyDaily(Integer page, + Integer pageSize, + Date beginTime, + Date endTime, + HttpServletRequest request) { + return null; + } public List encapsulateArrayClass(List diff --git a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java index 1c01f68..c7b6700 100644 --- a/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java @@ -189,10 +189,10 @@ public class ReviewServiceImpl implements ReviewService { public BaseResponse addReview(ReviewAddVO reviewAddVO, HttpServletRequest request) { //获取用户 - Long userId = Processing.getAuthHeaderToUserId(request); + Integer userId = Math.toIntExact(Processing.getAuthHeaderToUserId(request)); //检查对应项目，子系统，子模块是否存在 - if (!projectDAO.isExistProjectById(reviewAddVO.getProjectId())) { + if (!projectDAO.isExistProjectById(Long.valueOf(reviewAddVO.getProjectId()))) { return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); } @@ -369,7 +369,7 @@ public class ReviewServiceImpl implements ReviewService { Processing.copyProperties(reviewDO, reviewVO); // 赋值其他非空属性 reviewVO.setCategory(Processing.turnReviewCategory(reviewDO.getCategory())) - .setSenderName(userMapper.getUserById(reviewDO.getSenderId()).getNickname()) + .setSenderName(userMapper.getUserById(Long.valueOf(reviewDO.getSenderId())).getNickname()) .setProjectName(projectDAO.getProjectById(reviewDO.getProjectId()).getName()) .setProjectChildName(projectMapper.getProjectChildById( Math.toIntExact(reviewDO.getProjectChildId())).getName())