Merge remote-tracking branch 'origin/master'

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -82,7 +83,7 @@ public class RecordsServiceImpl implements RecordsService {
                         .likeIfPresent(StaffRecordSDO::getMajor, reqVO.getMajor())
                         .eqIfPresent(StaffRecordSDO::getZgxl, reqVO.getZgxl())
                         .inIfPresent(StaffRecordSDO::getUserId, userIds)
-                        .ne(StaffRecordSDO::getLoginName,"admin")//过滤掉管理员
+                        .ne(StaffRecordSDO::getLoginName, "admin")//过滤掉管理员
                         .orderByDesc(StaffRecordSDO::getUpdateTime)
         );
 
@@ -99,6 +100,12 @@ public class RecordsServiceImpl implements RecordsService {
             userList.forEach(v -> map.put(v.getId(), v));
             page.getRecords().forEach(v -> {
                 AdminUserRespDTO user = map.get(v.getUserId());
+
+                //判断初始入公司时间
+                if (v.getYsrzsj() != null) {
+                    v.setRgssj(LocalDateTime.of(v.getYsrzsj(), LocalTime.MIDNIGHT));
+                }
+
                 if (user != null) {
                     v.setDeptName(user.getDeptName());
                     v.setDeptId(user.getDeptId());
@@ -143,6 +150,11 @@ public class RecordsServiceImpl implements RecordsService {
             vo.setFamilyList(family);
         }
 
+        if (vo.getYsrzsj() != null) {
+            vo.setRgssj(LocalDateTime.of(vo.getYsrzsj(), LocalTime.MIDNIGHT));
+        }
+
+
         return vo;
     }