From 701d5ca0fb3da20fb336d66e08f4aa3c6b85c731 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 29 十一月 2024 09:37:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 627869c..a2446bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -211,6 +211,9 @@
insert.setHkId(UUID.randomUUID().toString().replace("-",""));
insert.setHkStatus(Constants.ONE);
insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
+ insert.setJobDate(member.getJobDate());
+ insert.setIsDangyuan(member.getIsDangyuan());
+ insert.setPositionId(member.getPositionId());
if(StringUtils.isNotBlank(member.getIdcardNo())){
insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//韬唤璇佸彿鍔犲瘑
@@ -1469,6 +1472,9 @@
}else{
memberInfoDTO.setRoleTimeInfo("-");
}
+ memberInfoDTO.setAuthStatus(Constants.formatIntegerNum(memberInfoDTO.getAuthStatus()));
+ memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+ memberInfoDTO.setSex(Constants.formatIntegerNum(memberInfoDTO.getSex()));
}
}
return PageData.from(memberIPage);
--
Gitblit v1.9.3