From b26bb88a280687437ecac93544edc7e00e89b1fd Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 29 Sep 2022 08:43:16 +0800
Subject: [PATCH] 任务列表sql添加巡检人员查询、查询时间返回格式修改
---
src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/taskinfo/entity/TaskInfoEntity.java | 7 +++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskinfo/entity/TaskInfoEntity.java b/src/main/java/org/springblade/modules/taskinfo/entity/TaskInfoEntity.java
index d6c8313..f0151a2 100644
--- a/src/main/java/org/springblade/modules/taskinfo/entity/TaskInfoEntity.java
+++ b/src/main/java/org/springblade/modules/taskinfo/entity/TaskInfoEntity.java
@@ -18,6 +18,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -47,11 +48,17 @@
* 开始时间
*/
@ApiModelProperty(value = "开始时间")
+ @JsonFormat(
+ pattern = "yyyy-MM-dd"
+ )
private Date startTime;
/**
* 结束时间
*/
@ApiModelProperty(value = "结束时间")
+ @JsonFormat(
+ pattern = "yyyy-MM-dd"
+ )
private Date endTime;
/**
* 内容
diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
index 9a4a9d1..4bc251e 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
@@ -32,6 +32,12 @@
<if test="taskinfo.title != null and taskinfo.title != '' ">
and title like concat('%',#{taskinfo.title},'%')
</if>
+ <if test="taskinfo.state != null and taskinfo.state != '' ">
+ and state = #{taskinfo.state}
+ </if>
+ <if test="taskinfo.toUserId != null and taskinfo.toUserId != '' ">
+ and to_user_id = #{taskinfo.toUserId}
+ </if>
<if test="taskinfo.startTime != null ">
and start_time >= #{taskinfo.startTime}
</if>
--
Gitblit v1.9.3