小程序订单

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalDepartmentBo.java

@@ -68,14 +68,14 @@ public class HospitalDepartmentBo extends BaseEntity {
      */
     @ApiModelProperty(value = "创建时间开始")
     @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTimeStart;
 
     /**
      * 创建时间结束
      */
     @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间结束")
     private Date createTimeEnd;
 

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/impl/HospitalDepartmentServiceImpl.java

@@ -1,12 +1,9 @@
 package com.ruoyi.info.hospital.service.impl;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,11 +20,12 @@ import com.ruoyi.info.hospital.exception.HospitalDepartmentExceptionEnum;
 import com.ruoyi.info.hospital.exception.HospitalExceptionEnum;
 import com.ruoyi.info.hospital.mapper.HospitalDepartmentMapper;
 import com.ruoyi.info.hospital.service.IHospitalDepartmentService;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 医院科室信息Service业务层处理
@@ -71,8 +69,12 @@ public class HospitalDepartmentServiceImpl implements IHospitalDepartmentService
         LambdaQueryWrapper<HospitalDepartment> lqw = Wrappers.lambdaQuery();
         lqw.eq(ObjectUtil.isNotNull(bo.getHospitalId()), HospitalDepartment::getHospitalId, bo.getHospitalId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), HospitalDepartment::getName, bo.getName());
-        lqw.ge(ObjectUtil.isNotNull(bo.getCreateTimeStart()), HospitalDepartment::getCreateTime, bo.getCreateTimeStart());
-        lqw.le(ObjectUtil.isNotNull(bo.getCreateTimeEnd()), HospitalDepartment::getCreateTime, bo.getCreateTimeEnd());
+        if(bo.getCreateTimeStart() != null) {
+            lqw.ge(HospitalDepartment::getCreateTime, DateUtil.beginOfDay(bo.getCreateTimeStart()));
+        }
+        if(bo.getCreateTimeEnd() != null) {
+            lqw.le(HospitalDepartment::getCreateTime, DateUtil.endOfDay(bo.getCreateTimeEnd()));
+        }
         lqw.eq(StringUtils.isNotBlank(bo.getRackStatus()), HospitalDepartment::getRackStatus, bo.getRackStatus());
         lqw.orderByDesc(HospitalDepartment::getSortOrder).orderByDesc(HospitalDepartment::getId);
         return lqw;