From 276818f5db0125c215ccd118dc7162172b92e3b3 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 23 五月 2023 17:35:47 +0800
Subject: [PATCH] 456
---
zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java | 2 +-
zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java | 4 ++--
zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java | 8 ++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java | 14 +++++++-------
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
index ee1f042..04b4b1f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
@@ -88,7 +88,7 @@
*/
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData/{pid}")
- public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable Long pid) throws Exception
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable String pid) throws Exception
{
ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
List<ZfPetNote> eventList = util.importExcel(file.getInputStream());
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java b/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
index 847a3cc..8b003ce 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
@@ -42,9 +42,9 @@
// @ExcelProperty({"鎴风睄鍦板潃"})
private String address;
- @Excel(name = "宸ヤ綔鍦板潃")
+ @Excel(name = "韬唤璇�")
// @ExcelProperty({"宸ヤ綔鍦板潃"})
- private String workAddress;
+ private String idNo;
@Excel(name = "濠氬Щ鐘跺喌",readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅")
// @ExcelProperty(value = {"濠氬Щ鐘跺喌"},converter = BearStatusConverter.class)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
index 97e96f7..975ea29 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPetNote.java
@@ -33,7 +33,7 @@
/**
* 瀹犵墿id
*/
- private Long pid;
+ private String pid;
/**
* 璁板綍鏃堕棿
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 d0d1ac0..fb45095 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
@@ -37,8 +37,8 @@
@Excel(name = "涓汉鎴风睄鍦板潃",headerBackgroundColor = IndexedColors.YELLOW)
private String address;
// @ExcelProperty({"涓汉淇℃伅","宸ヤ綔鍦板潃"})
- @Excel(name = "涓汉宸ヤ綔鍦板潃",headerBackgroundColor = IndexedColors.YELLOW)
- private String workAddress;
+ @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;
@@ -66,8 +66,8 @@
@Excel(name = "閰嶅伓鎴风睄鍦板潃",headerBackgroundColor = IndexedColors.GREEN)
private String spouseAddress;
// @ExcelProperty(value = {"閰嶅伓淇℃伅","宸ヤ綔鍦板潃"})
- @Excel(name = "閰嶅伓宸ヤ綔鍦板潃",headerBackgroundColor = IndexedColors.GREEN)
- private String spouseWorkAddress;
+ @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;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
index 455af82..0822d3f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
@@ -102,7 +102,7 @@
marryInfoDto.setName(myself.getName());
marryInfoDto.setBirthday(myself.getBirthday());
marryInfoDto.setAddress(myself.getAddress());
- marryInfoDto.setWorkAddress(myself.getWorkAddress());
+ marryInfoDto.setIdNo(myself.getIdNo());
marryInfoDto.setMarryStatus(myself.getMarryStatus());
marryInfoDto.setSex(myself.getSex());
marryInfoDto.setNation(myself.getNation());
@@ -112,7 +112,7 @@
marryInfoDto.setSpouseName(spouse.getName());
marryInfoDto.setSpouseBirthday(spouse.getBirthday());
marryInfoDto.setSpouseAddress(spouse.getAddress());
- marryInfoDto.setSpouseWorkAddress(spouse.getWorkAddress());
+ marryInfoDto.setSpouseIdNo(spouse.getIdNo());
marryInfoDto.setSpouseMarryStatus(spouse.getMarryStatus());
marryInfoDto.setSpouseSex(spouse.getSex());
marryInfoDto.setSpouseNation(spouse.getNation());
@@ -149,7 +149,7 @@
myself.setName(marryInfoDto.getName());
myself.setBirthday(marryInfoDto.getBirthday());
myself.setAddress(marryInfoDto.getAddress());
- myself.setWorkAddress(marryInfoDto.getWorkAddress());
+ myself.setIdNo(marryInfoDto.getIdNo());
myself.setMarryStatus(marryInfoDto.getMarryStatus());
myself.setSex(marryInfoDto.getSex());
myself.setMyId(userId);
@@ -163,7 +163,7 @@
spouse.setName(marryInfoDto.getSpouseName());
spouse.setBirthday(marryInfoDto.getSpouseBirthday());
spouse.setAddress(marryInfoDto.getSpouseAddress());
- spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
+ spouse.setIdNo(marryInfoDto.getSpouseIdNo());
spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
spouse.setSex(marryInfoDto.getSpouseSex());
spouse.setNation(marryInfoDto.getSpouseNation());
@@ -219,7 +219,7 @@
myself.setName(marryInfoDto.getName());
myself.setBirthday(marryInfoDto.getBirthday());
myself.setAddress(marryInfoDto.getAddress());
- myself.setWorkAddress(marryInfoDto.getWorkAddress());
+ myself.setIdNo(marryInfoDto.getIdNo());
myself.setMarryStatus(marryInfoDto.getMarryStatus());
myself.setSex(marryInfoDto.getSex());
myself.setNation(marryInfoDto.getNation());
@@ -252,7 +252,7 @@
spouse.setName(marryInfoDto.getSpouseName());
spouse.setBirthday(marryInfoDto.getSpouseBirthday());
spouse.setAddress(marryInfoDto.getSpouseAddress());
- spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
+ spouse.setIdNo(marryInfoDto.getSpouseIdNo());
spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
spouse.setSex(marryInfoDto.getSpouseSex());
spouse.setNation(marryInfoDto.getSpouseNation());
@@ -284,7 +284,7 @@
spouse.setName(marryInfoDto.getSpouseName());
spouse.setBirthday(marryInfoDto.getSpouseBirthday());
spouse.setAddress(marryInfoDto.getSpouseAddress());
- spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
+ spouse.setIdNo(marryInfoDto.getSpouseIdNo());
spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
spouse.setSex(marryInfoDto.getSpouseSex());
spouse.setNation(marryInfoDto.getSpouseNation());
--
Gitblit v1.9.1