字段新增

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsBaseVO.java

@@ -315,4 +315,9 @@ public class RecordsBaseVO {
      * 籍贯
      */
     private String jg;
+
+    /**
+     * 身份证有效期
+     */
+    private LocalDateTime sfzyxq;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/certificate/CertificateDO.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CertificateDO  {
+public class CertificateDO {
     /**
      * 主键ID
      */
@@ -72,6 +72,15 @@ public class CertificateDO  {
      * 原件地址
      */
     private String filePath;
+    /**
+     * 发证机构
+     */
+    private String fzjg;
+
+    /**
+     * 序号
+     */
+    private String indexCode;
 
 
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/PerformanceDetailDO.java

@@ -43,4 +43,9 @@ public class PerformanceDetailDO  {
      * 奖惩情况
      */
     private String detail;
+
+    /**
+     * 序号
+     */
+    private String indexCode;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/SchoolDetailDO.java

@@ -55,5 +55,10 @@ public class SchoolDetailDO {
      */
     private String filePath;
 
+    /**
+     * 序号
+     */
+    private String indexCode;
+
 
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/StaffFamilyDetailDO.java

@@ -52,4 +52,9 @@ public class StaffFamilyDetailDO {
      * 与员工关系
      */
     private String gx;
+
+    /**
+     * 序号
+     */
+    private String indexCode;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/StaffRecordSDO.java

@@ -320,5 +320,10 @@ public class StaffRecordSDO extends BaseDO {
      */
     private String jg;
 
+    /**
+     * 身份证有效期
+     */
+    private LocalDateTime sfzyxq;
+
 
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/WorkDetailDO.java

@@ -67,4 +67,9 @@ public class WorkDetailDO  {
      * 具体条款
      */
     private String competitionDetail;
+
+    /**
+     * 序号
+     */
+    private String indexCode;
 }

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

@@ -136,6 +136,7 @@ public class RecordsServiceImpl implements RecordsService {
             throw exception(STAFF_NOT_EXISTS);
         }
         RecordsRespVO vo = RecordsConvert.INSTANCE.convertDetail(staffRecordSDO);
+        System.out.println(vo.getJg());
         vo.setHtqdsj(staffRecordSDO.getHtqdsj());
         LocalDateTime now = LocalDateTime.now();
         if (vo.getRgssj() != null) {
@@ -152,38 +153,46 @@ public class RecordsServiceImpl implements RecordsService {
 
 
         //学校信息
-        List<SchoolDetailDO> schoolList = schoolDetailDOMapper.selectList(new LambdaQueryWrapperX<SchoolDetailDO>().eq(SchoolDetailDO::getUserId, userId));
+        List<SchoolDetailDO> schoolList = schoolDetailDOMapper.selectList(new LambdaQueryWrapperX<SchoolDetailDO>()
+                .eq(SchoolDetailDO::getUserId, userId)
+                .orderByAsc(SchoolDetailDO::getIndexCode)
+        );
         if (CollectionUtil.isNotEmpty(schoolList)) {
-            List<SchoolDetailDO> schools = schoolList.stream().sorted(
-                    (o1, o2) -> {
-                        long b1 =  o1.getBysj().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-                        long b2 = o2.getBysj().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-                        return -Long.compare(b2, b1);
-                    }
-            ).collect(Collectors.toList());
-            vo.setSchoolList(schools);
+            vo.setSchoolList(schoolList);
         }
 
         //工作经历
-        List<WorkDetailDO> workList = workDetailMapper.selectList(new LambdaQueryWrapperX<WorkDetailDO>().eq(WorkDetailDO::getUserId, userId));
+        List<WorkDetailDO> workList = workDetailMapper.selectList(new LambdaQueryWrapperX<WorkDetailDO>()
+                .eq(WorkDetailDO::getUserId, userId)
+                .orderByAsc(WorkDetailDO::getIndexCode)
+        );
         if (CollectionUtil.isNotEmpty(workList)) {
             vo.setWorkList(workList);
         }
 
         //证书查询
-        List<CertificateDO> certs = certMapper.selectList(new LambdaQueryWrapperX<CertificateDO>().eq(CertificateDO::getUserId, userId));
+        List<CertificateDO> certs = certMapper.selectList(new LambdaQueryWrapperX<CertificateDO>()
+                .eq(CertificateDO::getUserId, userId)
+                .orderByAsc(CertificateDO::getIndexCode)
+        );
         if (CollectionUtil.isNotEmpty(certs)) {
             vo.setCertList(certs);
         }
 
         //亲属查询
-        List<StaffFamilyDetailDO> family = familyDOMapper.selectList(new LambdaQueryWrapperX<StaffFamilyDetailDO>().eq(StaffFamilyDetailDO::getUserId, userId));
+        List<StaffFamilyDetailDO> family = familyDOMapper.selectList(new LambdaQueryWrapperX<StaffFamilyDetailDO>()
+                .eq(StaffFamilyDetailDO::getUserId, userId)
+                .orderByAsc(StaffFamilyDetailDO::getIndexCode)
+        );
         if (CollectionUtil.isNotEmpty(family)) {
             vo.setFamilyList(family);
         }
 
         //绩效考核
-        List<PerformanceDetailDO> performList = performanceDetailDOMapper.selectList(new LambdaQueryWrapperX<PerformanceDetailDO>().eq(PerformanceDetailDO::getUserId, userId));
+        List<PerformanceDetailDO> performList = performanceDetailDOMapper.selectList(new LambdaQueryWrapperX<PerformanceDetailDO>()
+                .eq(PerformanceDetailDO::getUserId, userId)
+                .orderByAsc(PerformanceDetailDO::getIndexCode)
+        );
         if (CollectionUtil.isNotEmpty(performList)) {
             vo.setPerformanceList(performList);
         }