From ebb1a448339bafc4c4849fdbc2291bd3a28261df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 一月 2024 10:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
index 56243a7..6855db7 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
@@ -1,15 +1,32 @@
package com.ycl.dto.dispatch;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.time.LocalDateTime;
+import java.util.List;
@Data
+@ApiModel("UploadDisposingResultParam")
public class UploadDisposingResultParam {
+ @ApiModelProperty(value = "妗堜欢id")
+ private Long caseId;
//鎵垮姙闃熷憳
+ @ApiModelProperty(value = "璋冩煡鍙栬瘉id")
+ private Long investigationId;
+
+ @ApiModelProperty(value = "鍒拌揪鐜板満id")
+ private Long arrivalSituationId;
+
+ @ApiModelProperty(value = "褰撲簨浜篿d")
+ private Long partyInfoId;
+
+
+ @ApiModelProperty(value = "鍥剧墖id")
+ private Integer imageResourcesId;
/**
* 鎵垮姙闃熷憳
*/
@@ -26,7 +43,8 @@
* 鏃堕棿
*/
@ApiModelProperty(value = "鏃堕棿")
- private LocalDateTime investigationTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String investigationTime;
/**
* 鍦板潃
@@ -56,7 +74,7 @@
* 鐓х墖
*/
@ApiModelProperty(value = "鐓х墖")
- private String pic;
+ private List<String> pic;
//鐜板満
@@ -64,7 +82,8 @@
* 鍒拌揪鏃堕棿
*/
@ApiModelProperty(value = "鍒拌揪鏃堕棿")
- private LocalDateTime arrivalTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String arrivalTime;
/**
* 鍒拌揪鍦板潃
@@ -88,7 +107,7 @@
* 鐜板満鎯呭喌鐓х墖
*/
@ApiModelProperty(value = "鐜板満鎯呭喌鐓х墖")
- private String situationPic;
+ private List<String> situationPic;
//鏂囦功
/**
@@ -113,13 +132,15 @@
* 鏂囦功鍙戞斁鏃堕棿
*/
@ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
- private LocalDateTime sendTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String sendTime;
/**
* 鏂囦功闄愬畾鏃堕棿
*/
@ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
- private LocalDateTime limitTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String limitTime;
/**
* 鏂囦功鍙戞斁鍐呭
@@ -131,7 +152,8 @@
* 瀹為檯鏁存敼鏃堕棿
*/
@ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
- private LocalDateTime rectifyTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String rectifyTime;
/**
* 鏁存敼鎯呭喌
@@ -169,6 +191,12 @@
@ApiModelProperty(value = "鍏朵粬鐓х墖")
private String otherPic;
+ /**
+ * 鏂囦功妯℃澘鍊�
+ */
+ @ApiModelProperty(value = "鏂囦功妯℃澘鍊�")
+ private String value;
+
//褰撲簨浜�
/**
@@ -187,7 +215,7 @@
* 璇佷欢绫诲瀷
*/
@ApiModelProperty(value = "璇佷欢绫诲瀷")
- private String certificateType;
+ private Integer certificateType;
/**
* 璇佷欢鍙�
@@ -199,7 +227,7 @@
* 鏂囧寲绋嬪害
*/
@ApiModelProperty(value = "鏂囧寲绋嬪害")
- private String educationDegree;
+ private Integer educationDegree;
/**
* 鑱屼笟
@@ -217,7 +245,7 @@
* 姘戞棌
*/
@ApiModelProperty(value = "姘戞棌")
- private String nation;
+ private Integer nation;
/**
* 绫嶈疮
--
Gitblit v1.8.0