From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZMarryController.java |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 107 insertions(+), 3 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 5b245fe..d6a8961 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
@@ -1,9 +1,27 @@
 package com.ruoyi.web.controller.zhang;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+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;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -15,7 +33,93 @@
  */
 @RestController
 @RequestMapping("/zMarry")
-public class ZMarryController {
+@Slf4j
+public class ZMarryController extends BaseController {
+//    @Autowired
+//    private ZMarryService zMarryService;
+//
+//
+//    /**
+//     *  鏌ヨ褰撳墠濠氬Щ鐘跺喌
+//     */
+//    @GetMapping("/list")
+//    public AjaxResult getMarryStatus(){
+//        return zMarryService.getNow();
+//    }
+//
+//    /**
+//     * 鏂板濠氬Щ鐘跺喌璁板綍
+//     */
+////    @PreAuthorize("@ss.hasPermi('system:property:add')")
+//    @Log(title = "濠氬Щ鐘跺喌璁板綍", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody MarryInfoDto marryInfoDto)
+//    {
+//        return zMarryService.addInfo(marryInfoDto);
+//    }
+//
+//    /**
+//     * 淇敼濠氬Щ鐘跺喌璁板綍
+//     */
+////    @PreAuthorize("@ss.hasPermi('system:property:edit')")
+//    @Log(title = "濠氬Щ鐘跺喌璁板綍", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody MarryInfoDto marryInfoDto)
+//    {
+//        return zMarryService.updateInfo(marryInfoDto);
+//    }
+////
+//    /**
+//     * 鎵归噺鍒犻櫎濠氬Щ鐘跺喌璁板綍
+//     */
+////    @PreAuthorize("@ss.hasPermi('system:property:remove')")
+//    @Log(title = "濠氬Щ鐘跺喌璁板綍", businessType = BusinessType.DELETE)
+//    @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