档案字段变更

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

@@ -267,12 +267,12 @@ public class RecordsBaseVO {
     /**
      * 原始合同起始时间
      */
-    private LocalDate yshtqssj;
+    private LocalDateTime yshtqssj;
 
     /**
      * 原始入职时间
      */
-    private LocalDate ysrzsj;
+    private LocalDateTime ysrzsj;
 
     /**
      * 年龄
@@ -304,7 +304,7 @@ public class RecordsBaseVO {
     /**
      * 毕业时间
      */
-    private LocalDate bysj;
+    private LocalDateTime bysj;
 
     /**
      * 司龄

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

@@ -43,7 +43,7 @@ public class SchoolDetailDO {
     /**
      * 毕业时间
      */
-    private LocalDate bysj;
+    private LocalDateTime bysj;
 
     /**
      * 学历

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

@@ -276,12 +276,12 @@ public class StaffRecordSDO extends BaseDO {
     /**
      * 原始合同起始时间
      */
-    private LocalDate yshtqssj;
+    private LocalDateTime yshtqssj;
 
     /**
      * 原始入职时间
      */
-    private LocalDate ysrzsj;
+    private LocalDateTime ysrzsj;
 
     /**
      * 年龄
@@ -313,7 +313,7 @@ public class StaffRecordSDO extends BaseDO {
     /**
      * 毕业时间
      */
-    private LocalDate bysj;
+    private LocalDateTime bysj;
 
 
 }

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

@@ -114,7 +114,7 @@ public class RecordsServiceImpl implements RecordsService {
 
                 //判断初始入公司时间
                 if (v.getYsrzsj() != null) {
-                    v.setRgssj(LocalDateTime.of(v.getYsrzsj(), LocalTime.MIDNIGHT));
+                    v.setRgssj(v.getYsrzsj());
                 }
 
                 if (user != null) {
@@ -187,7 +187,7 @@ public class RecordsServiceImpl implements RecordsService {
         }
 
         if (vo.getYsrzsj() != null) {
-            vo.setRgssj(LocalDateTime.of(vo.getYsrzsj(), LocalTime.MIDNIGHT));
+            vo.setRgssj(vo.getYsrzsj());
         }