From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java | 107 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 80 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
index 22db060..607c13a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
@@ -1,15 +1,15 @@
package com.panzhihua.common.model.vos.community;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @auther txb
@@ -26,7 +26,7 @@
/**
* 安全工作记录id
*/
- @ApiModelProperty("巡查记录id")
+ @ApiModelProperty("安全工作记录id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@@ -38,21 +38,34 @@
private Long communityId;
/**
+ * 社区名称
+ */
+ @ApiModelProperty("社区名称")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String communityName;
+
+ /**
* 巡查时间
*/
@ApiModelProperty("巡查时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date PatrolTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date patrolTime;
/**
- * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
- */
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
@ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
private String patrolType;
/**
- * 巡查人员
- */
+ * 巡查领导id
+ */
+ @ApiModelProperty("巡查领导id")
+ private String patrolLeader;
+
+ /**
+ * 巡查人员
+ */
@ApiModelProperty("巡查人员")
private String patrolPerson;
@@ -63,39 +76,39 @@
private String address;
/**
- * 巡查记录
- */
+ * 巡查记录
+ */
@ApiModelProperty("巡查记录")
private String recordContent;
/**
- * 发现记录
- */
+ * 发现记录
+ */
@ApiModelProperty("发现记录")
private String findRecord;
/**
- * 记录照片
- */
+ * 记录照片
+ */
@ApiModelProperty("记录照片")
private String recordPhoto;
/**
- * 备注
- */
+ * 备注
+ */
@ApiModelProperty("备注")
private String remark;
/**
- * 创建时间
- */
+ * 创建时间
+ */
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
/**
- * 更新时间
- */
+ * 更新时间
+ */
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
@@ -106,10 +119,50 @@
@ApiModelProperty("创建人")
private Long createBy;
+ @ApiModelProperty("填报人名字")
+ private String createName;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 接班领导id
+ */
+ @ApiModelProperty("接班领导id")
+ private String successionLeader;
+
+ /**
+ * 接班领导名字
+ */
+ @ApiModelProperty("接班领导名字")
+ private String successionLeaderName;
+
+ /**
+ * 接班人员id
+ */
+ @ApiModelProperty("接班人员id")
+ private String successionPerson;
+
+ /**
+ * 接班人员名字
+ */
+ @ApiModelProperty("接班人员名字")
+ private String successionPersonName;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date successionTime;
+
/**
* 巡查类型
*/
- public interface patrolType{
+ public interface patrolType {
int huo = 1;
int xun = 2;
int yi = 3;
--
Gitblit v1.7.1