From 93c5fa99663b13e7dae50621da5e1332e753ce5e Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Fri, 5 Jul 2024 09:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96,=E4=BF=AE=E6=94=B9LocalDate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/knowledge/KnowledgeManageController.java | 5 +++--
.../supervision/knowsub/service/KnowledgeManageService.java | 5 +++--
.../knowsub/service/impl/KnowledgeManageServiceImpl.java | 5 +++--
.../java/com/supervision/knowsub/mapper/KnowledgeMapper.java | 5 +++--
.../com/supervision/knowsub/service/KnowledgeService.java | 5 +++--
.../knowsub/service/impl/KnowledgeServiceImpl.java | 5 +++--
6 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java
index d685247..c59bc79 100644
--- a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java
@@ -17,6 +17,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Slf4j
@@ -46,8 +47,8 @@ public class KnowledgeManageController {
@RequestParam(required = false) String publishDeptId,
@RequestParam(required = false) String baseId,
@RequestParam(required = false) String submittedDeptId,
- @RequestParam(required = false)LocalDateTime publishDateBegin,
- @RequestParam(required = false)LocalDateTime publishDateEnd,
+ @RequestParam(required = false) LocalDate publishDateBegin,
+ @RequestParam(required = false)LocalDate publishDateEnd,
Integer pageNum, Integer pageSize) {
return knowledgeManageService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, pageNum, pageSize);
}
diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java
index fed99b2..5dc3c07 100644
--- a/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java
@@ -9,6 +9,7 @@ import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.time.LocalDate;
import java.time.LocalDateTime;
public interface KnowledgeManageService {
@@ -18,8 +19,8 @@ public interface KnowledgeManageService {
String publishDeptId,
String baseId,
String submitDeptId,
- LocalDateTime publishDateBegin,
- LocalDateTime publishDateEnd,
+ LocalDate publishDateBegin,
+ LocalDate publishDateEnd,
Integer pageNum, Integer pageSize);
void saveKnowledge(SaveKnowledgeReqVO reqVO);
diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java
index 689651a..807c746 100644
--- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java
@@ -20,6 +20,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -56,8 +57,8 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
String publishDeptId,
String baseId,
String submitDeptId,
- LocalDateTime publishDateBegin,
- LocalDateTime publishDateEnd, Integer pageNum, Integer pageSize) {
+ LocalDate publishDateBegin,
+ LocalDate publishDateEnd, Integer pageNum, Integer pageSize) {
String userId = UserUtil.getUser().getId();
// 除全部可以看所有外,其他tab都是看到自己报送的知识的状态(或参与过的)
IPage<KnowledgePageResVO> knowledgeIPage = knowledgeService.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, pageNum, pageSize);
diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java
index fe65e7c..f23bf6c 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
import org.apache.ibatis.annotations.Param;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -24,8 +25,8 @@ public interface KnowledgeMapper extends BaseMapper<Knowledge> {
@Param("publishDeptId") String publishDeptId,
@Param("baseId") String baseId,
@Param("submitDeptId") String submitDeptId,
- @Param("publishDateBegin") LocalDateTime publishDateBegin,
- @Param("publishDateEnd") LocalDateTime publishDateEnd,
+ @Param("publishDateBegin") LocalDate publishDateBegin,
+ @Param("publishDateEnd") LocalDate publishDateEnd,
@Param("userId") String userId, Page<Knowledge> page);
List<CheckInvalidDTO> queryKnowledgeInvalidList();
diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java
index dd12e8c..fa69f13 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java
@@ -6,6 +6,7 @@ import com.supervision.knowsub.model.Knowledge;
import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -27,8 +28,8 @@ public interface KnowledgeService extends IService<Knowledge> {
String publishDeptId,
String baseId,
String submitDeptId,
- LocalDateTime publishDateBegin,
- LocalDateTime publishDateEnd, String userId, Integer pageNum, Integer pageSize);
+ LocalDate publishDateBegin,
+ LocalDate publishDateEnd, String userId, Integer pageNum, Integer pageSize);
List<CheckInvalidDTO> queryKnowledgeInvalidList();
}
diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java
index 4ddf0c4..2fb784b 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java
@@ -10,6 +10,7 @@ import com.supervision.knowsub.mapper.KnowledgeMapper;
import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
import org.springframework.stereotype.Service;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -28,8 +29,8 @@ public class KnowledgeServiceImpl extends ServiceImpl<KnowledgeMapper, Knowledge
String publishDeptId,
String baseId,
String submitDeptId,
- LocalDateTime publishDateBegin,
- LocalDateTime publishDateEnd, String userId, Integer pageNum, Integer pageSize) {
+ LocalDate publishDateBegin,
+ LocalDate publishDateEnd, String userId, Integer pageNum, Integer pageSize) {
return this.baseMapper.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, new Page<>(pageNum, pageSize));
}