填充查询结束时间

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/HospitalController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.info;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -28,6 +29,7 @@ import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.date.LocalDateTimeUtils;
 import com.ruoyi.info.hospital.domain.bo.HospitalBo;
 import com.ruoyi.info.hospital.domain.bo.HospitalQrCodeBo;
 import com.ruoyi.info.hospital.domain.bo.HospitalRackUpdateBo;
@@ -39,6 +41,7 @@ import com.ruoyi.system.service.ISysOssService;
 import com.ruoyi.weixin.service.WxMinService;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.IdUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -67,10 +70,13 @@ public class HospitalController extends BaseController {
     /**
      * 分页查询医院信息列表
      */
-    @ApiOperation("查询医院信息列表")
+    @ApiOperation("查询医院信息分页")
     @SaCheckPermission("info:hospital:list")
     @GetMapping("/page")
     public TableDataInfo<HospitalVo> page(@Validated(QueryGroup.class) HospitalBo bo, PageQuery pageQuery) {
+        if (bo.getCreateTimeEnd() != null) {
+            bo.setCreateTimeEnd(LocalDateTimeUtils.getEndOfDate(bo.getCreateTimeEnd()));
+        }
         return iHospitalService.queryPageList(bo, pageQuery);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/HospitalDepartmentController.java

@@ -23,6 +23,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.date.LocalDateTimeUtils;
 import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentBo;
 import com.ruoyi.info.hospital.domain.bo.HospitalDepartmentRackUpdateBo;
 import com.ruoyi.info.hospital.domain.bo.HospitalRackUpdateBo;
@@ -57,6 +58,9 @@ public class HospitalDepartmentController extends BaseController {
     @SaCheckPermission("info:hospitalDepartment:list")
     @GetMapping("/page")
     public TableDataInfo<HospitalDepartmentVo> page(@Validated(QueryGroup.class) HospitalDepartmentBo bo, PageQuery pageQuery) {
+        if (bo.getCreateTimeEnd() != null) {
+            bo.setCreateTimeEnd(LocalDateTimeUtils.getEndOfDate(bo.getCreateTimeEnd()));
+        }
         return iHospitalDepartmentService.queryPageList(bo, pageQuery);
     }
 

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiHospitalController.java

@@ -43,7 +43,7 @@ public class ApiHospitalController {
      */
     @ApiOperation("查询医院信息列表")
     @GetMapping("/list")
-    public R<List<HospitalSimpleInfoVo>> list(@ApiParam("经纬度，以逗号隔开") @RequestParam(required = false) String coordinates) {
+    public R<List<HospitalVo>> list(@ApiParam("经纬度，以逗号隔开") @RequestParam(required = false) String coordinates) {
         List<HospitalVo> hospitalVoList = iHospitalService.queryList(new HospitalBo());
         if (!StrUtil.isEmpty(coordinates)) {
             // 如果坐标不为空，则计算相对距离
@@ -61,6 +61,6 @@ public class ApiHospitalController {
             hospitalVoList.sort(Comparator.comparing(HospitalVo::getRelativeDistance));
         }
 
-        return R.ok(BeanCopyUtils.copyList(hospitalVoList, HospitalSimpleInfoVo.class));
+        return R.ok(hospitalVoList);
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/date/LocalDateTimeUtils.java

@@ -7,6 +7,9 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Calendar;
 import java.util.Date;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
+
 /**
  * 时间工具类，用于 {@link LocalDateTime}
  *
@@ -457,6 +460,17 @@ public class LocalDateTimeUtils {
         return zonedDateTime.getZone().getRules().isDaylightSavings(zonedDateTime.toInstant());
     }
 
+    /**
+     * 获取指定日期的结束时间
+     *
+     * @param date
+     * @return
+     */
+    public static Date getEndOfDate(Date date) {
+        LocalDateTime endOfDay = LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.of(date));
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
 
     public static void main(String[] args) {