教职工信息相关信息导入,时间的处理（导入的时候用Date接收保证正常接收，固化的时候转换为LocalDate保证时间回显的正常格式）

src/main/java/com/xjrsoft/module/teacher/service/impl/TeacherbaseManagerServiceImpl.java

@@ -112,8 +112,11 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -1062,6 +1065,43 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             ProfessionalTitle insertOrUpdate = new ProfessionalTitle();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getGetDate())){
+                Instant instant = vo.getGetDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setGetDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+            if(ObjectUtils.isNotEmpty(vo.getBeHonoredDate())){
+                Instant instant = vo.getBeHonoredDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setBeHonoredDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+            if(ObjectUtils.isNotEmpty(vo.getIssuanceDate())){
+                Instant instant = vo.getIssuanceDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setIssuanceDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+            if(ObjectUtils.isNotEmpty(vo.getQualificationStartDate())){
+                Instant instant = vo.getQualificationStartDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setQualificationStartDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+            if(ObjectUtils.isNotEmpty(vo.getQualificationEndDate())){
+                Instant instant = vo.getQualificationEndDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setQualificationEndDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+            if(ObjectUtils.isNotEmpty(vo.getNoticeDate())){
+                Instant instant = vo.getNoticeDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setNoticeDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
             insertOrUpdate.setJobStatus(jobStatus);
@@ -1147,6 +1187,13 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             TeacherCertification insertOrUpdate = new TeacherCertification();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getIssuanceDate())){
+                Instant instant = vo.getIssuanceDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setIssuanceDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 
@@ -1230,6 +1277,20 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             EvaluatorInformation insertOrUpdate = new EvaluatorInformation();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getIssuanceDate())){
+                Instant instant = vo.getIssuanceDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setIssuanceDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getValidity())){
+                Instant instant = vo.getValidity().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setValidity(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 
@@ -1313,6 +1374,13 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             LanguageCompetence insertOrUpdate = new LanguageCompetence();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getIssuanceDate())){
+                Instant instant = vo.getIssuanceDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setIssuanceDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 
@@ -1396,10 +1464,20 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             // 判断是否需要新增或更新
             Map<LocalDate, FacultyContract> existingMap = mapByUserIdThenNo.getOrDefault(user.getId(), Collections.emptyMap());
-            FacultyContract existing = existingMap.get(vo.getStartDate());
-
+            Instant instant = vo.getStartDate().toInstant();
+            // 使用系统默认时区将 Instant 转换为 LocalDate
+            LocalDate startDate = instant.atZone(ZoneId.systemDefault()).toLocalDate();
+            FacultyContract existing = existingMap.get(startDate);
             FacultyContract insertOrUpdate = new FacultyContract();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            insertOrUpdate.setStartDate(startDate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getEndDate())){
+                Instant endDateInstant = vo.getEndDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setEndDate(endDateInstant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 
@@ -1483,6 +1561,19 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             OutsideAssociations insertOrUpdate = new OutsideAssociations();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getJoinDate())){
+                Instant instant = vo.getJoinDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setJoinDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+
+            if(ObjectUtils.isNotEmpty(vo.getExitDate())){
+                Instant instant = vo.getExitDate().toInstant();
+                insertOrUpdate.setExitDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 
@@ -1563,9 +1654,15 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
             // 判断是否需要新增或更新
             Map<String, CoreTeacher> existingMap = mapByUserIdThenNo.getOrDefault(user.getId(), Collections.emptyMap());
             CoreTeacher existing = existingMap.get(vo.getCertificationNo());
-
             CoreTeacher insertOrUpdate = new CoreTeacher();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getIssuanceDate())){
+                Instant instant = vo.getIssuanceDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setIssuanceDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 
@@ -1646,9 +1743,15 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
             // 判断是否需要新增或更新
             Map<String, ScientificResearch> existingMap = mapByUserIdThenNo.getOrDefault(user.getId(), Collections.emptyMap());
             ScientificResearch existing = existingMap.get(vo.getName());
-
             ScientificResearch insertOrUpdate = new ScientificResearch();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getIssuanceDate())){
+                Instant instant = vo.getIssuanceDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setIssuanceDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 
@@ -1733,6 +1836,14 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
 
             JobInformation insertOrUpdate = new JobInformation();
             BeanUtils.copyProperties(vo, insertOrUpdate);
+            // 处理时间字符串
+            if(ObjectUtils.isNotEmpty(vo.getEmployDate())){
+                Instant instant = vo.getEmployDate().toInstant();
+
+                // 使用系统默认时区将 Instant 转换为 LocalDate
+                insertOrUpdate.setEmployDate(instant.atZone(ZoneId.systemDefault()).toLocalDate());
+            }
+
             insertOrUpdate.setUserId(user.getId());
             insertOrUpdate.setDeptId(user.getCode());
 

src/main/java/com/xjrsoft/module/teacher/vo/CoreTeacherImportVo.java

@@ -6,8 +6,7 @@ import com.xjrsoft.common.annotation.Required;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 骨干教师记录分页列表出参
@@ -78,7 +77,7 @@ public class CoreTeacherImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("认证时间")
     @ApiModelProperty("认证时间")
-    private LocalDate issuanceDate;
+    private Date issuanceDate;
     /**
     * 备注
     */

src/main/java/com/xjrsoft/module/teacher/vo/EvaluatorInformationImportVo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 考评员信息分页列表出参
@@ -76,13 +77,13 @@ public class EvaluatorInformationImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("发证时间")
     @ApiModelProperty("发证时间")
-    private LocalDate issuanceDate;
+    private Date issuanceDate;
     /**
     * 有效期
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("有效期")
     @ApiModelProperty("有效期")
-    private LocalDate validity;
+    private Date validity;
 
 }

src/main/java/com/xjrsoft/module/teacher/vo/FacultyContractImportVo.java

@@ -6,8 +6,7 @@ import com.xjrsoft.common.annotation.Required;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 教职工合同记录分页列表出参
@@ -40,7 +39,7 @@ public class FacultyContractImportVo {
     @ExcelProperty("起始日期")
     @ApiModelProperty("起始日期")
     @Required
-    private LocalDate startDate;
+    private Date startDate;
     /**
     * 结束日期
     */
@@ -48,7 +47,7 @@ public class FacultyContractImportVo {
     @ExcelProperty("结束日期")
     @ApiModelProperty("结束日期")
     @Required
-    private LocalDate endDate;
+    private Date endDate;
     /**
     * 合同岗位
     */

src/main/java/com/xjrsoft/module/teacher/vo/JobInformationImportVo.java

@@ -6,8 +6,7 @@ import com.xjrsoft.common.annotation.Required;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 岗位信息记录分页列表出参
@@ -54,7 +53,7 @@ public class JobInformationImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("聘用时间")
     @ApiModelProperty("聘用时间")
-    private LocalDate employDate;
+    private Date employDate;
     /**
     * 聘用文号
     */

src/main/java/com/xjrsoft/module/teacher/vo/LanguageCompetenceImportVo.java

@@ -6,8 +6,7 @@ import com.xjrsoft.common.annotation.Required;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 语言能力信息分页列表出参
@@ -77,6 +76,6 @@ public class LanguageCompetenceImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("发证时间")
     @ApiModelProperty("发证时间")
-    private LocalDate issuanceDate;
+    private Date issuanceDate;
 
 }

src/main/java/com/xjrsoft/module/teacher/vo/OutsideAssociationsImportVo.java

@@ -5,9 +5,11 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.xjrsoft.common.annotation.Required;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 校外其他协会记录分页列表出参
@@ -48,14 +50,14 @@ public class OutsideAssociationsImportVo {
     @ExcelProperty("加入时间")
     @ApiModelProperty("加入时间")
     @Required
-    private LocalDate joinDate;
+    private Date joinDate;
     /**
     * 退出时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("退出时间")
     @ApiModelProperty("退出时间")
-    private LocalDate exitDate;
+    private Date exitDate;
     /**
     * 职务
     */

src/main/java/com/xjrsoft/module/teacher/vo/ProfessionalTitleImportVo.java

@@ -6,8 +6,7 @@ import com.xjrsoft.common.annotation.Required;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 教职工职称信息分页列表出参
@@ -55,7 +54,7 @@ public class ProfessionalTitleImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("取得时间")
     @ApiModelProperty("取得时间")
-    private LocalDate getDate;
+    private Date getDate;
     /**
     * 学科类别
     */
@@ -69,35 +68,35 @@ public class ProfessionalTitleImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("授予时间")
     @ApiModelProperty("授予时间")
-    private LocalDate beHonoredDate;
+    private Date beHonoredDate;
     /**
     * 发证时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("发证时间")
     @ApiModelProperty("发证时间")
-    private LocalDate issuanceDate;
+    private Date issuanceDate;
     /**
     * 任职资格开始时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("任职资格开始时间")
     @ApiModelProperty("任职资格开始时间")
-    private LocalDate qualificationStartDate;
+    private Date qualificationStartDate;
     /**
     * 任职资格结束时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("任职资格结束时间")
     @ApiModelProperty("任职资格结束时间")
-    private LocalDate qualificationEndDate;
+    private Date qualificationEndDate;
     /**
     * 发文时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("发文时间")
     @ApiModelProperty("发文时间")
-    private LocalDate noticeDate;
+    private Date noticeDate;
     /**
     * 职称类别
     */

src/main/java/com/xjrsoft/module/teacher/vo/ScientificResearchImportVo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 科研信息记录分页列表出参
@@ -75,7 +76,7 @@ public class ScientificResearchImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("发证时间")
     @ApiModelProperty("发证时间")
-    private LocalDate issuanceDate;
+    private Date issuanceDate;
     /**
     * 备注
     */

src/main/java/com/xjrsoft/module/teacher/vo/TeacherCertificationImportVo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
 * @title: 教师资格证信息分页列表出参
@@ -76,6 +77,6 @@ public class TeacherCertificationImportVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("发证时间")
     @ApiModelProperty("发证时间")
-    private LocalDate issuanceDate;
+    private Date issuanceDate;
 
 }