From a7663ee9b2a4f717cca4d3ecff5ac29b14088f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 22 Dec 2023 16:17:29 +0800
Subject: [PATCH] 'commit'

---
 .../Collect/Controller/CollectController.java |  7 ++++-
 .../QingLong/Collect/Model/CollectModel.java  | 30 ++++++++++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
index ccce0953..c9760bb1 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -7,6 +7,7 @@ import com.dsideal.QingLong.Collect.Model.CollectModel;
 import com.dsideal.QingLong.Interceptor.EmptyInterface;
 import com.dsideal.QingLong.Interceptor.IsLoginInterface;
 import com.dsideal.QingLong.Interceptor.IsNumericInterface;
+import com.dsideal.QingLong.Interceptor.LayUiPageInfoInterface;
 import com.dsideal.QingLong.LoginPerson.Model.LoginPersonModel;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.Util.SessionKit;
@@ -485,10 +486,14 @@ public class CollectController extends Controller {
      * 功能：获取任务列表，支持关键字查询
      *
      * @param job_name
+     * http://10.10.21.20:9000/QingLong/collect/getJobList?page=1&limit=10
      */
+
     @Before({GET.class})
     @IsLoginInterface({})
-    public void getJobList(String job_name, int page, int limit) {
+    @IsNumericInterface({"page", "limit"})
+    @LayUiPageInfoInterface({"page", "limit"})
+    public void getJobList(String job_name, int page, int limit) throws ParseException {
         Page<Record> list = cm.getJobList(job_name, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index c1fcc0e3..b62d0b6c 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -853,7 +853,7 @@ public class CollectModel {
      *
      * @param job_name
      */
-    public Page<Record> getJobList(String job_name, int page, int limit) {
+    public Page<Record> getJobList(String job_name, int page, int limit) throws ParseException {
         Kv kv = Kv.create();
         if (!StrKit.isBlank(job_name)) kv.set("job_name", job_name);
         SqlPara sqlPara = Db.getSqlPara("Collect.getJobList", kv);
@@ -873,16 +873,32 @@ public class CollectModel {
             long currentTime = System.currentTimeMillis();
 
             Calendar calendar = Calendar.getInstance();
-            calendar.setTime(record.getDate("deadline_time"));
+            Date deadline_time = record.getDate("deadline_time");
+            if (deadline_time == null) {
+                String dateString = "2100-01-01"; // 假设这是你的初始日期字符串
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                deadline_time = dateFormat.parse(dateString);
+            }
+            calendar.setTime(deadline_time);
             calendar.add(Calendar.DAY_OF_MONTH, 1);
-            // 比较 yourDate 和当前时间
-            if (calendar.getTime().getTime() > currentTime) {
-                record.set("jiezhi", true);
+            record.set("jiezhi", calendar.getTime().getTime() < currentTime);
+
+            if (record.getStr("create_time") != null) {
+                record.set("create_time", record.getStr("create_time").split(" ")[0]);
+            } else {
+                record.set("create_time", "-");
+            }
+            if (record.getStr("publish_time") != null) {
+                record.set("publish_time", record.getStr("publish_time").split(" ")[0]);
             } else {
-                record.set("jiezhi", false);
+                record.set("publish_time", "-");
+            }
+            if (record.getStr("deadline_time") != null) {
+                record.set("deadline_time", record.getStr("deadline_time").split(" ")[0]);
+            } else {
+                record.set("deadline_time", "-");
             }
         }
-
         return pageRecord;
     }
 }
\ No newline at end of file