From 6d92697fdec73f86669974eb6e5052e95f8c25be Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Fri, 12 Jul 2024 17:50:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BC=96=E7=A0=81=E5=8F=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/controller/InspectionTasksController.java | 1 + .../org/energy/modules/inspection/entity/InspectionResult.java | 3 +++ .../modules/inspection/mapper/InspectionResultMapper.xml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java index b632682..d0294bf 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -86,6 +86,7 @@ public class InspectionTasksController extends DafController { @ApiOperation(value = "分页", notes = "传入inspectionTasks") public R> list(InspectionTasks inspectionTasks, Query query) { QueryWrapper qw = new QueryWrapper<>(); + qw.orderByAsc("task_no"); // 场站 if (null != inspectionTasks.getStation()) { qw.lambda().eq(InspectionTasks::getStation, inspectionTasks.getStation()); diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java index 3803776..4ef0496 100644 --- a/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java @@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; import java.time.LocalDateTime; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @@ -46,11 +47,13 @@ public class InspectionResult extends BaseEntity { * 任务执行开始时间 */ @ApiModelProperty(value = "任务执行开始时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss") private LocalDateTime executeStartDate; /** * 任务执行结束时间 */ @ApiModelProperty(value = "任务执行结束时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss") private LocalDateTime executeEndDate; /** * 巡检结果 diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml index 7ce5c0c..985b6dd 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionResultMapper.xml @@ -24,7 +24,7 @@ select * from i_inspection_result where is_deleted = 0 - select max(result_no) from i_inspection_result where result_no like ${taskNo}