From 1f5b65a28808b0635e1816ca7b4270c94fa7fda9 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 05 八月 2023 10:14:19 +0800
Subject: [PATCH] 51561
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZMarryController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZMarryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZMarryController.java
index 95c572e..58aa3e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZMarryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZMarryController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.MarryUser;
import com.ruoyi.domain.ZMarry;
import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.service.ZMarryService;
@@ -17,7 +18,9 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
/**
@@ -71,12 +74,52 @@
*/
// @PreAuthorize("@ss.hasPermi('system:property:remove')")
@Log(title = "濠氬Щ鐘跺喌璁板綍", businessType = BusinessType.DELETE)
- @DeleteMapping()
- public AjaxResult remove(String id)
+ @DeleteMapping("/{id}")
+ public AjaxResult remove(@PathVariable String id)
{
return zMarryService.deleteOld(id);
}
+// /**
+// * 瀵煎嚭濠氬Щ鐘跺喌
+// */
+// @PostMapping("/export")
+// public void export(HttpServletResponse response)
+// {
+// AjaxResult marryStatus = getMarryStatus();
+// HashMap data = (HashMap) marryStatus.get("data");
+//
+// List<MarryUser> myInfoList = Arrays.asList((MarryUser) data.get("myInfo"));
+// ExcelUtil<MarryUser> util1 = new ExcelUtil<>(MarryUser.class);
+// util1.exportEasyExcel(response,myInfoList,"涓汉淇℃伅");
+//
+// List<MarryUser> spouseInfoList = Arrays.asList((MarryUser) data.get("spouseInfo"));
+// ExcelUtil<MarryUser> util2 = new ExcelUtil<>(MarryUser.class);
+// util2.exportEasyExcel(response,spouseInfoList,"閰嶅伓淇℃伅");
+//
+// List<ZMarry> marryInfoList = Arrays.asList((ZMarry) data.get("marryInfo"));
+// ExcelUtil<ZMarry> util3 = new ExcelUtil<>(ZMarry.class);
+// util3.exportEasyExcel(response,marryInfoList,"濠氬Щ淇℃伅");
+//
+// List<MarryUser> oldSpouseInfoList = (List<MarryUser>) data.get("oldSpouseInfo");
+// ExcelUtil<MarryUser> util4 = new ExcelUtil<>(MarryUser.class);
+// util4.exportEasyExcel(response,oldSpouseInfoList,"鍓嶄换淇℃伅");
+// }
+
+
+ /**
+ * 瀵煎嚭
+ */
+ @PostMapping("/export")
+ public void export(HttpServletResponse response){
+ AjaxResult marryStatus = getMarryStatus();
+ MarryInfoDto data = (MarryInfoDto) marryStatus.get("data");
+ List<MarryInfoDto> list = Arrays.asList(data);
+ ExcelUtil<MarryInfoDto> util1 = new ExcelUtil<>(MarryInfoDto.class);
+ util1.exportExcel(response,list,"濠氬Щ淇℃伅");
+ }
+
+
}
--
Gitblit v1.9.1