处理前端传时间参数Date类型不方便后端打补丁解决

pump-admin/src/main/test/com/tuoren/web/Test1.java

@@ -156,11 +156,11 @@ public class Test1 {
 
     @Test
     public void test8() throws Exception{
-        InfusionListParam infusionListParam = new InfusionListParam();
-//        infusionListParam.setPumpCode("51236535303002A8");
-        infusionListParam.setHospitalCode("43332553109747f3857e1e434e1e2ef4");
-//        infusionListParam.setPatientCode("999900091");
-        IPage<BusPumpEntity> busPumpEntityIPage = iBusPumpService.queryInfusionList(infusionListParam);
-        System.out.println(busPumpEntityIPage);
+        PumpNewParam param = new PumpNewParam();
+        List<String> objects = new ArrayList<>();
+        objects.add("2025-06-18 00:00:00");
+        objects.add("2025-06-18 23:59:59");
+        param.setTimeRange(objects);
+        iBusPumpService.queryPumpInfoNew(param);
     }
 }

pump-web/src/main/java/com/tuoren/web/layer/service/impl/BusPumpServiceImpl.java

@@ -1,6 +1,8 @@
 package com.tuoren.web.layer.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

pump-web/src/main/java/com/tuoren/web/layer/vo/PumpNewParam.java

@@ -81,15 +81,14 @@ public class PumpNewParam {
     @ApiModelProperty(value = "提示",hidden = true)
     private List<String> tipList;
 
-    public void setTimeRange(List<Date> startTime) {
+    public void setTimeRange(List<String> timeRange) {
         this.timeRange = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(startTime)) {
-            this.timeRange.add(DateUtil.beginOfDay(CollectionUtil.getFirst(startTime)));
-            if (startTime.size() > 1) {
-                this.timeRange.add(DateUtil.endOfDay(CollectionUtil.getLast(startTime)));
+        if (CollectionUtil.isNotEmpty(timeRange)) {
+            this.timeRange.add(DateUtil.beginOfDay(DateUtil.parseDate(CollectionUtil.getFirst(timeRange))));
+            if (timeRange.size() > 1) {
+                this.timeRange.add(DateUtil.endOfDay(DateUtil.parseDate(CollectionUtil.getLast(timeRange))));
             }
 
         }
     }
-
 }

pump-web/src/main/resources/mapper/BusPumpEntityMapper.xml

@@ -298,6 +298,7 @@
         pi.operation_name,
         pi.formula,
         pi.exception_flag,
+        pi.ward_code,
         CASE
         WHEN pi.last_score_time IS NULL THEN
         0
@@ -370,7 +371,7 @@
             </if>
         </where>
         <if test="pumpParam.sort != null and !pumpParam.sort ">
-            ORDER BY result.bed_code asc
+            ORDER BY result.patientInfoBedNo asc
         </if>
         <if test="(pumpParam.sort != null and pumpParam.sort) or pumpParam.sort == null">
             ORDER BY result.last_upload_time desc