From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
index b2bb8ee..db907ca 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBuildInfo.java
@@ -1,6 +1,8 @@
package cn.gistack.sm.sjztmd.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -20,7 +22,7 @@
* @date 2023-08-15
*/
@Data
-@TableName("\"att_res_build_info\"")
+@TableName("\"tb_att_res_build_info\"")
@ApiModel(value = "水库建设信息对象", description = "水库建设信息对象")
public class TbAttResBuildInfo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,7 +32,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
private String guid;
/**
@@ -45,8 +47,8 @@
*/
@ApiModelProperty(value = "工程开工时间")
@TableField("\"start_time\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/**
@@ -54,21 +56,29 @@
*/
@ApiModelProperty(value = "蓄水验收时间")
@TableField("\"completion_time\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date completionTime;
-
/**
* 最近一次加固开始时间
*/
@ApiModelProperty(value = "最近一次加固开始时间")
@TableField("\"reinforce_tm\"")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date reinforceTm;
/**
+ * 下闸蓄水时间
+ */
+ @ApiModelProperty(value = "下闸蓄水时间")
+ @TableField("\"water_storage_tm\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date waterStorageTm;
+
+ /**
* 填报状态（0:填写中，1:审核中，2:审核通过）
*/
@ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
--
Gitblit v1.9.3