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/materials/entity/MaterialsManage.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
index ba8fa38..8801d91 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/entity/MaterialsManage.java
@@ -1,12 +1,19 @@
package cn.gistack.sm.materials.entity;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* @PROJECT_NAME: skjcmanager
@@ -15,11 +22,17 @@
* @DATE: 2023/5/30 14:52
*/
@Data
-@TableName("sm_materials_manage")
+@TableName(value = "sm_materials_manage",autoResultMap = true)
@ApiModel(value = "应急物资管理对象", description = "应急物资管理对象")
+@EqualsAndHashCode(callSuper = true)
public class MaterialsManage extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
+
+ /**
+ * 防汛年度
+ */
+ private Integer materialsYear;
/**
* 水库id
@@ -34,10 +47,25 @@
private String resName;
/**
- * 行政区
+ * 城市
*/
- @ApiModelProperty(value = "行政区")
- private String adCode;
+ @ApiModelProperty(value = "城市")
+ @TableField(value = "city",updateStrategy = FieldStrategy.IGNORED)
+ private String city;
+
+ /**
+ * 乡镇
+ */
+ @ApiModelProperty(value = "区县")
+ @TableField(value = "county",updateStrategy = FieldStrategy.IGNORED)
+ private String county;
+
+ /**
+ * 乡镇
+ */
+ @ApiModelProperty(value = "乡镇")
+ @TableField(value = "town",updateStrategy = FieldStrategy.IGNORED)
+ private String town;
/**
* 物资类型
@@ -69,4 +97,25 @@
@ApiModelProperty(value = "备注")
private String remarks;
+ /**
+ * 合同
+ */
+ @ApiModelProperty(value = "合同")
+ @TableField(value = "contract",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
+ private Object[] contract;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty("图片")
+ @TableField(value = "images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
+ private Object[] images;
+
+ /**
+ * 入库时间
+ */
+ @ApiModelProperty(value = "入库时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date importTime;
}
--
Gitblit v1.9.3