From eb433a1a8a1c23738277ff5e7234eb8ccb1d7f74 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 04 十二月 2023 18:04:32 +0800
Subject: [PATCH] #供应人员性别处理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |    3 +++
 server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java        |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
index 8169aee..45cdff7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
@@ -52,6 +52,9 @@
     @ApiModelProperty(value = "璁垮鍚嶇О")
     private String name;
 
+    @ApiModelProperty(value = "鎬у埆")
+    private Integer sex;
+
     @ApiModelProperty(value = "璁垮骞撮緞")
     private Date birthday;
 
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 5e4213c..5e60a0b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -327,6 +327,9 @@
                     .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
                     .having("trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
         IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
+            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
+        }
         return PageData.from(memberIPage);
     }
 

--
Gitblit v1.9.3