From ca6708c3a3027cb5945a231b1b643ae742e3db17 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 11:19:39 +0800
Subject: [PATCH] 任务增加类型
---
src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java | 8 ++++++++
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 5 ++++-
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 2 ++
3 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index 9e0ac2f..6e0ca70 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -307,5 +307,7 @@
return R.data(map);
}
+// @GetMapping("/")
+
}
diff --git a/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java b/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
index d8b8833..5e9bf19 100644
--- a/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
+++ b/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
@@ -63,6 +63,14 @@
private String time;
/**
+ * 任务时间
+ */
+ @ApiModelProperty(value = "预估结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String endtime;
+
+ /**
* 省
*/
@ApiModelProperty(value = "省")
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index 6189cc4..5d185f1 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -82,7 +82,10 @@
</if>
<if test="type==1">
<if test="jurisdiction!='1372091709474910209'">
- qd.jnum!=qd.num AND qd.rtype = "2"
+ <if test="tasktype !=2">
+ qd.jnum!=qd.num AND
+ </if>
+ qd.rtype = "2"
and qd.tasktype=#{tasktype}
and (!find_in_set(#{serid}, serid) OR serid IS NULL )
and (j.id =#{jurisdiction} or
--
Gitblit v1.9.3