From 1c093829c5e7f58a04a34a831aace4b21a835250 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 07 八月 2023 23:15:07 +0800
Subject: [PATCH] 15487
---
zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java | 135 ++++++++++++++++++++++++++++++---------------
1 files changed, 90 insertions(+), 45 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java
index fb45095..9a550d6 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java
@@ -24,71 +24,116 @@
private static final long serialVersionUID = 1L;
//鎴戜釜浜虹殑鏁版嵁
- private String id;
+ private Long id;
// @ExcelProperty({"涓汉鏁版嵁","濮撳悕"})
@Excel(name = "涓汉濮撳悕",headerBackgroundColor = IndexedColors.YELLOW)
private String name;
+
+ // @ExcelProperty(value = {"涓汉淇℃伅","鎬у埆"})
+ @Excel(name = "涓汉鎬у埆",headerBackgroundColor = IndexedColors.YELLOW)
+ private String sex;
+
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
// @ExcelProperty({"涓汉淇℃伅","鐢熸棩"})
// @DateTimeFormat("yyyy-MM-dd")
@Excel(name = "涓汉鐢熸棩", dateFormat = "yyyy-MM-dd",headerBackgroundColor = IndexedColors.YELLOW)
private Date birthday;
- // @ExcelProperty({"涓汉淇℃伅","鎴风睄鍦板潃"})
- @Excel(name = "涓汉鎴风睄鍦板潃",headerBackgroundColor = IndexedColors.YELLOW)
- private String address;
- // @ExcelProperty({"涓汉淇℃伅","宸ヤ綔鍦板潃"})
- @Excel(name = "涓汉韬唤璇�",headerBackgroundColor = IndexedColors.YELLOW)
- private String idNo;
- // @ExcelProperty(value = {"涓汉淇℃伅","濠氬Щ鐘跺喌"},converter = BearStatusConverter.class)
- @Excel(name = "涓汉濠氬Щ鐘跺喌", readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅",headerBackgroundColor = IndexedColors.YELLOW)
- private Integer marryStatus;
- // @ExcelProperty(value = {"涓汉淇℃伅","鎬у埆"})
- @Excel(name = "涓汉鎬у埆", readConverterExp = "0=濂�,1=鐢�",headerBackgroundColor = IndexedColors.YELLOW)
- private Integer sex;
+
// @ExcelProperty(value = {"涓汉淇℃伅","姘戞棌"})
@Excel(name = "涓汉姘戞棌",headerBackgroundColor = IndexedColors.YELLOW)
private String nation;
+
+ @Excel(name = "涓汉韬唤璇�",headerBackgroundColor = IndexedColors.YELLOW)
+ private String idNo;
+
// @ExcelProperty(value = {"涓汉淇℃伅","鎵嬫満鍙风爜"})
@Excel(name = "涓汉鐢佃瘽鍙风爜",headerBackgroundColor = IndexedColors.YELLOW)
private String phone;
- //閰嶅伓鐨勬暟鎹�
- private String spouseId;
- // @ExcelProperty(value = {"閰嶅伓淇℃伅","濮撳悕"})
- @Excel(name = "閰嶅伓濮撳悕",headerBackgroundColor = IndexedColors.GREEN)
- private String spouseName;
+ // @ExcelProperty(value = {"涓汉淇℃伅","濠氬Щ鐘跺喌"},converter = BearStatusConverter.class)
+ @Excel(name = "涓汉濠氬Щ鐘跺喌", readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅",headerBackgroundColor = IndexedColors.YELLOW)
+ private Integer marryStatus;
+
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-// @ExcelProperty(value = {"閰嶅伓淇℃伅","鐢熸棩"})
-// @DateTimeFormat("yyyy-MM-dd")
- @Excel(name = "閰嶅伓鐢熸棩", dateFormat = "yyyy-MM-dd",headerBackgroundColor = IndexedColors.GREEN)
+ @Excel(name = "缁撳鏃堕棿", dateFormat = "yyyy-MM-dd",headerBackgroundColor = IndexedColors.YELLOW)
+ private Date marryTime;
+
+ // @ExcelProperty({"涓汉淇℃伅","鎴风睄鍦板潃"})
+ @Excel(name = "涓汉鎴风睄鍦板潃",headerBackgroundColor = IndexedColors.YELLOW)
+ private String address;
+
+
+ @Excel(name = "閰嶅伓濮撳悕")
+ private String spouseName;
+
+ @Excel(name = "閰嶅伓鎬у埆")
+ private String spouseSex;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "閰嶅伓鐢熸棩", dateFormat = "yyyy-MM-dd")
private Date spouseBirthday;
- // @ExcelProperty(value = {"閰嶅伓淇℃伅","鎴风睄鍦板潃"})
- @Excel(name = "閰嶅伓鎴风睄鍦板潃",headerBackgroundColor = IndexedColors.GREEN)
- private String spouseAddress;
- // @ExcelProperty(value = {"閰嶅伓淇℃伅","宸ヤ綔鍦板潃"})
- @Excel(name = "閰嶅伓韬唤璇�",headerBackgroundColor = IndexedColors.GREEN)
- private String spouseIdNo;
- // @ExcelProperty(value = {"閰嶅伓淇℃伅","濠氬Щ鐘跺喌"},converter = BearStatusConverter.class)
- @Excel(name = "閰嶅伓濠氬Щ鐘跺喌", readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅",headerBackgroundColor = IndexedColors.GREEN)
- private Integer spouseMarryStatus;
- // @ExcelProperty(value = {"閰嶅伓淇℃伅","鎬у埆"})
- @Excel(name = "閰嶅伓鎬у埆", readConverterExp = "0=濂�,1=鐢�",headerBackgroundColor = IndexedColors.GREEN)
- private Integer spouseSex;
- // @ExcelProperty(value = {"閰嶅伓淇℃伅","姘戞棌"})
- @Excel(name = "閰嶅伓姘戞棌",headerBackgroundColor = IndexedColors.GREEN)
+
+ @Excel(name = "閰嶅伓姘戞棌")
private String spouseNation;
- @Excel(name = "閰嶅伓鎵嬫満鍙风爜",headerBackgroundColor = IndexedColors.GREEN)
+
+ @Excel(name = "閰嶅伓韬唤璇�")
+ private String spouseIdNo;
+
+ @Excel(name = "閰嶅伓鎵嬫満鍙风爜")
private String spousePhone;
+ @Excel(name = "閰嶅伓濠氬Щ鐘跺喌",readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅")
+ private Integer spouseMarryStatus;
- //鐢熻偛鎯呭喌(涓棿琛�)
- private Long marryId;
- /**
- * 缁撳鏃堕棿
- */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @Excel(name = "缁撳鏃堕棿", dateFormat = "yyyy-MM-dd")
- private Date marryTime;
+ @Excel(name = "閰嶅伓缁撳鏃堕棿", dateFormat = "yyyy-MM-dd")
+ private Date spouseMarryTime;
+
+ @Excel(name = "閰嶅伓鎴风睄鍦板潃")
+ private String spouseAddress;
+
+// //閰嶅伓鐨勬暟鎹�
+// private Long spouseId;
+// // @ExcelProperty(value = {"閰嶅伓淇℃伅","濮撳悕"})
+// @Excel(name = "閰嶅伓濮撳悕",headerBackgroundColor = IndexedColors.GREEN)
+// private String spouseName;
+// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//
+// // @ExcelProperty(value = {"閰嶅伓淇℃伅","鎬у埆"})
+// @Excel(name = "閰嶅伓鎬у埆", readConverterExp = "0=濂�,1=鐢�",headerBackgroundColor = IndexedColors.GREEN)
+// private Integer spouseSex;
+//
+//// @ExcelProperty(value = {"閰嶅伓淇℃伅","鐢熸棩"})
+//// @DateTimeFormat("yyyy-MM-dd")
+// @Excel(name = "閰嶅伓鐢熸棩", dateFormat = "yyyy-MM-dd",headerBackgroundColor = IndexedColors.GREEN)
+// private Date spouseBirthday;
+//
+// // @ExcelProperty(value = {"閰嶅伓淇℃伅","姘戞棌"})
+// @Excel(name = "閰嶅伓姘戞棌",headerBackgroundColor = IndexedColors.GREEN)
+// private String spouseNation;
+//
+// @Excel(name = "閰嶅伓韬唤璇�",headerBackgroundColor = IndexedColors.GREEN)
+// private String spouseIdNo;
+//
+// // @ExcelProperty(value = {"閰嶅伓淇℃伅","鎴风睄鍦板潃"})
+// @Excel(name = "閰嶅伓鎴风睄鍦板潃",headerBackgroundColor = IndexedColors.GREEN)
+// private String spouseAddress;
+//
+// @Excel(name = "閰嶅伓鎵嬫満鍙风爜",headerBackgroundColor = IndexedColors.GREEN)
+// private String spousePhone;
+//
+// // @ExcelProperty(value = {"閰嶅伓淇℃伅","宸ヤ綔鍦板潃"})
+//
+// // @ExcelProperty(value = {"閰嶅伓淇℃伅","濠氬Щ鐘跺喌"},converter = BearStatusConverter.class)
+// @Excel(name = "閰嶅伓濠氬Щ鐘跺喌", readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅",headerBackgroundColor = IndexedColors.GREEN)
+// private Integer spouseMarryStatus;
+//
+// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+// @Excel(name = "閰嶅伓缁撳鏃堕棿", dateFormat = "yyyy-MM-dd",headerBackgroundColor = IndexedColors.GREEN)
+// private Date spouseMarryTime;
+
+
+ //鐢熻偛鎯呭喌
/**
* 鐢熻偛鎯呭喌,0锛氭湭鐢熻偛銆�1锛氬湪瀛曘��2锛氬凡鐢熻偛
@@ -106,7 +151,7 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date oneBornTime;
@Excel(name = "闇�澹版槑鐨勬儏鍐�")
- private String content;
+ private String notion;
@Excel(name = "澶囨敞")
private String remark;
@@ -114,6 +159,6 @@
* 鍓嶄换淇℃伅鐨凩ist
*/
@Excel(name = "鍓嶄换淇℃伅",headerBackgroundColor= IndexedColors.RED)
- private List<MarryUser> oldSpouseList;
+ private List<MarryUserDto> oldSpouseList;
}
--
Gitblit v1.9.1