From 7c3dc3a3939a1d591f422061c9e4a6602fe064b4 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 30 十一月 2022 16:02:14 +0800
Subject: [PATCH] fix: 卡口管理
---
ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java | 2 +-
ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml | 5 ++---
ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java | 3 ++-
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
index 306e208..ef4dd90 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java
@@ -68,7 +68,7 @@
*/
@TableField("send_time")
@ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime sendTime;
/**
@@ -76,7 +76,7 @@
*/
@TableField("limit_time")
@ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime limitTime;
/**
@@ -91,7 +91,7 @@
*/
@TableField("rectify_time")
@ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime rectifyTime;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
index bea07f8..14c3738 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
@@ -87,5 +87,5 @@
* 鎵�灞炲尯鍩�
*/
@TableField("belong_area")
- private Integer belongArea;
+ private String belongArea;
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
index da9ae92..3645a59 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
@@ -95,6 +95,7 @@
@ExcelProperty(index = 6, value = "鍑哄叆鍩庣被鍨�")
private String inOutCityTypeName;
- @ExcelIgnore
+ @ApiModelProperty(value = "鎵�灞炲尯鍩�")
+ @ExcelProperty(index = 7, value = "鎵�灞炲尯鍩�")
private String belongArea;
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
index 3687103..146a602 100644
--- a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
@@ -28,12 +28,11 @@
t1.latitude,
t1.longitude,
t1.`port`,
- t1.belong_area belongArea,
+ t1.belong_area,
t1.front_end_type frontEndType,
t1.in_out_city_type inOutCityType,
t2.`name` as frontEndTypeName,
- t3.`name` as inOutCityTypeName,
- t4.region_name as belongArea
+ t3.`name` as inOutCityTypeName
FROM
`ums_equipment_bayonet` t1
LEFT JOIN
--
Gitblit v1.8.0