优化,修改LocalDate

release_1.0.0
liu 11 months ago
parent c103d319ce
commit 93c5fa9966

@ -17,6 +17,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Slf4j @Slf4j
@ -46,8 +47,8 @@ public class KnowledgeManageController {
@RequestParam(required = false) String publishDeptId, @RequestParam(required = false) String publishDeptId,
@RequestParam(required = false) String baseId, @RequestParam(required = false) String baseId,
@RequestParam(required = false) String submittedDeptId, @RequestParam(required = false) String submittedDeptId,
@RequestParam(required = false)LocalDateTime publishDateBegin, @RequestParam(required = false) LocalDate publishDateBegin,
@RequestParam(required = false)LocalDateTime publishDateEnd, @RequestParam(required = false)LocalDate publishDateEnd,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
return knowledgeManageService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, pageNum, pageSize); return knowledgeManageService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, pageNum, pageSize);
} }

@ -9,6 +9,7 @@ import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
public interface KnowledgeManageService { public interface KnowledgeManageService {
@ -18,8 +19,8 @@ public interface KnowledgeManageService {
String publishDeptId, String publishDeptId,
String baseId, String baseId,
String submitDeptId, String submitDeptId,
LocalDateTime publishDateBegin, LocalDate publishDateBegin,
LocalDateTime publishDateEnd, LocalDate publishDateEnd,
Integer pageNum, Integer pageSize); Integer pageNum, Integer pageSize);
void saveKnowledge(SaveKnowledgeReqVO reqVO); void saveKnowledge(SaveKnowledgeReqVO reqVO);

@ -20,6 +20,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -56,8 +57,8 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
String publishDeptId, String publishDeptId,
String baseId, String baseId,
String submitDeptId, String submitDeptId,
LocalDateTime publishDateBegin, LocalDate publishDateBegin,
LocalDateTime publishDateEnd, Integer pageNum, Integer pageSize) { LocalDate publishDateEnd, Integer pageNum, Integer pageSize) {
String userId = UserUtil.getUser().getId(); String userId = UserUtil.getUser().getId();
// 除全部可以看所有外,其他tab都是看到自己报送的知识的状态(或参与过的) // 除全部可以看所有外,其他tab都是看到自己报送的知识的状态(或参与过的)
IPage<KnowledgePageResVO> knowledgeIPage = knowledgeService.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, pageNum, pageSize); IPage<KnowledgePageResVO> knowledgeIPage = knowledgeService.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, pageNum, pageSize);

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO; import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -24,8 +25,8 @@ public interface KnowledgeMapper extends BaseMapper<Knowledge> {
@Param("publishDeptId") String publishDeptId, @Param("publishDeptId") String publishDeptId,
@Param("baseId") String baseId, @Param("baseId") String baseId,
@Param("submitDeptId") String submitDeptId, @Param("submitDeptId") String submitDeptId,
@Param("publishDateBegin") LocalDateTime publishDateBegin, @Param("publishDateBegin") LocalDate publishDateBegin,
@Param("publishDateEnd") LocalDateTime publishDateEnd, @Param("publishDateEnd") LocalDate publishDateEnd,
@Param("userId") String userId, Page<Knowledge> page); @Param("userId") String userId, Page<Knowledge> page);
List<CheckInvalidDTO> queryKnowledgeInvalidList(); List<CheckInvalidDTO> queryKnowledgeInvalidList();

@ -6,6 +6,7 @@ import com.supervision.knowsub.model.Knowledge;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO; import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -27,8 +28,8 @@ public interface KnowledgeService extends IService<Knowledge> {
String publishDeptId, String publishDeptId,
String baseId, String baseId,
String submitDeptId, String submitDeptId,
LocalDateTime publishDateBegin, LocalDate publishDateBegin,
LocalDateTime publishDateEnd, String userId, Integer pageNum, Integer pageSize); LocalDate publishDateEnd, String userId, Integer pageNum, Integer pageSize);
List<CheckInvalidDTO> queryKnowledgeInvalidList(); List<CheckInvalidDTO> queryKnowledgeInvalidList();
} }

@ -10,6 +10,7 @@ import com.supervision.knowsub.mapper.KnowledgeMapper;
import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO; import com.supervision.knowsub.vo.knowledge.KnowledgePageResVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -28,8 +29,8 @@ public class KnowledgeServiceImpl extends ServiceImpl<KnowledgeMapper, Knowledge
String publishDeptId, String publishDeptId,
String baseId, String baseId,
String submitDeptId, String submitDeptId,
LocalDateTime publishDateBegin, LocalDate publishDateBegin,
LocalDateTime publishDateEnd, String userId, Integer pageNum, Integer pageSize) { LocalDate publishDateEnd, String userId, Integer pageNum, Integer pageSize) {
return this.baseMapper.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, new Page<>(pageNum, pageSize)); return this.baseMapper.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, new Page<>(pageNum, pageSize));
} }

Loading…
Cancel
Save