From 780fa6d4016c6e616bbb4b3d29d33dbf3a40cbd6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 07 七月 2024 10:22:12 +0800
Subject: [PATCH] 修改bug&新加配偶接口

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index d8a85b6..e4e2075 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -2,6 +2,7 @@
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,6 +13,7 @@
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfDoctor;
 import com.ruoyi.domain.ZfRelation;
 
 import com.ruoyi.domain.dto.Genealogy;
@@ -28,10 +30,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.server.PathParam;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Pattern;
 
 import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -218,15 +217,41 @@
                 sex = 1;
             }
             List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
-            List<Long> satisfyIds = new ArrayList<>();
+            List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
+            HashMap<Long,String> bs = new HashMap<>();
             for (ZInfoUser zInfoUser:zInfoUsers) {
-                if (zInfoUser.getIsMyFamily() == 1)
-                    if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid)){
-                        satisfyIds.add(zInfoUser.getUserId());
+                    if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
+                        bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+
                     }
+
             }
+            satisfyIds.add(bs);
             return AjaxResult.success(satisfyIds);
         }
+
+    @GetMapping("/sex/{sex}")
+    public AjaxResult findBySex(@PathVariable("sex")  Integer sex)
+    {
+//            Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
+        //sex == 0 -> 鐢�
+        if (sex == 1){
+            sex = 0;
+        }
+        else if (sex == 0){
+            sex = 1;
+        }
+        List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
+        List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
+        HashMap<Long,String> bs = new HashMap<>();
+        for (ZInfoUser zInfoUser:zInfoUsers) {
+            if (zInfoUser.getMaritalStatus() ==null || zInfoUser.getMaritalStatus() != 1 )
+                bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
+
+        }
+        satisfyIds.add(bs);
+        return AjaxResult.success(satisfyIds);
+    }
     /**
      * 鏍规嵁鐢ㄦ埛id鍒ゆ柇鏄惁鏄紓鎬�
      */

--
Gitblit v1.9.1