闵行报错接口修复；代码优化

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemWaterSourceMaintain.java

@@ -42,7 +42,7 @@ public class DemWaterSourceMaintain implements Serializable {
     /**
      * 取水点位置描述
      */
-    @TableField(value = "`describe`")
+    @TableField(value = "describe")
     private String describe;
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/ReservePlan.java

@@ -2,6 +2,7 @@ package com.usky.fire.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -56,6 +57,7 @@ public class ReservePlan implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReservePlanServiceImpl.java

@@ -17,10 +17,8 @@ import com.usky.fire.service.vo.DataCountVo;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 /**
  * <p>
@@ -81,13 +79,14 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
         IPage<ReservePlan> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<ReservePlan> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(ReservePlan::getId, ReservePlan::getReserveName, ReservePlan::getReserveUrl, ReservePlan::getReserveType,
-                ReservePlan::getCreator, ReservePlan::getCreateTime, ReservePlan::getCompanyId)
+                        ReservePlan::getCreator, ReservePlan::getCreateTime, ReservePlan::getCompanyId)
                 .eq(ReservePlan::getEnable, 1)
-                .eq(ReservePlan::getCreator, SecurityUtils.getUsername())
+                //.eq(ReservePlan::getCreator, SecurityUtils.getUsername())
                 .like(StringUtils.isNotBlank(reserveName), ReservePlan::getReserveName, reserveName)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate)
-                .orderByDesc(ReservePlan::getId);
+                .orderByDesc(ReservePlan::getCreateTime);
         page = this.page(page, queryWrapper);
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
@@ -96,8 +95,12 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
                 map.put("reserveType", page.getRecords().get(i).getReserveType());
                 map.put("reserveUrl", page.getRecords().get(i).getReserveUrl());
                 map.put("creator", page.getRecords().get(i).getCreator());
-                map.put("createTime", page.getRecords().get(i).getCreateTime());
+                map.put("createTime", page.getRecords().get(i).getCreateTime().format(fmt));
                 map.put("companyId", page.getRecords().get(i).getCompanyId());
+                map.put("updateTime",
+                        Optional.ofNullable(page.getRecords().get(i).getUpdateTime())
+                                .map(t -> t.format(fmt))
+                                .orElse(null));
                 list.add(map);
             }
         }