From 8a2ece559136713d060bc4011a42d4af8c1c7907 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Wed, 23 Oct 2024 15:15:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20ASW-111=20job=20startTimestamp,endTimeSt?=
 =?UTF-8?q?amp=20=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AE=E5=80=BC=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runner/service/impl/JobServiceImpl.java       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java b/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java
index 5fa4425..d7a5799 100644
--- a/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java
@@ -64,6 +64,13 @@ public class JobServiceImpl extends ServiceImpl<JobDao, JobEntity> implements IJ
 
         PackageEntity pkg = packageService.getById(job.getPackageId());
         job.setPkg(pkg);
+
+        if (-1 == job.getStartTimestamp()) {
+            job.setStartTimestamp(null);
+        }
+        if (-1 == job.getEndTimestamp()) {
+            job.setEndTimestamp(null);
+        }
         return job;
     }
 
@@ -71,6 +78,14 @@ public class JobServiceImpl extends ServiceImpl<JobDao, JobEntity> implements IJ
     public Page queryList(Map<String, Object> params) {
         Page page = new Query(JobEntity.class).getPage(params);
         List<JobEntity> jobList = this.getBaseMapper().queryList(page, params);
+        jobList.stream().forEach(jobEntity -> {
+            if (-1 == jobEntity.getStartTimestamp()) {
+                jobEntity.setStartTimestamp(null);
+            }
+            if (-1 == jobEntity.getEndTimestamp()) {
+                jobEntity.setEndTimestamp(null);
+            }
+        });
         page.setRecords(jobList);
         return page;
     }