2025-01-22

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java

@@ -222,7 +222,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
      * @param
      * @return
      */
-   @PostMapping("/export")
+    @PostMapping("/export")
     public void export(HttpServletResponse response, SchoolTeacherBasicInformationVo export ) throws Exception{
 
        //获取当前登陆人信息

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkload.java

@@ -83,5 +83,6 @@ public class SchoolAworkload extends BaseEntity
     private BigDecimal amountTo;
 
 
+    private String remark;
 
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java

@@ -52,7 +52,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
     /**
      * 档案出生日期 (年月)
      */
-    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "档案出生日期" ,dateFormat="yyyy-MM-dd")
     private Date fileBirthDate;
 
@@ -115,7 +115,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
     /**
      * 现职称取得资格时间
      */
-    @Excel(name = "现职称取得时间" ,dateFormat="yyyy-MM-dd")
+    @Excel(name = "现职称取得时间" ,dateFormat="yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date currentProfessionalTitleTime;
 
@@ -129,7 +129,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
      * 现职称聘任时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "现聘职称取得时间" ,dateFormat="yyyy-MM-dd")
+    @Excel(name = "现聘职称取得时间" ,dateFormat="yyyy-MM")
     private Date currentHiringProfessionalTitleTime;
 
     /**
@@ -148,7 +148,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
     /**
      * 现岗位等级聘任时间
      */
-    @Excel(name = "现聘岗位取得时间" ,dateFormat="yyyy-MM-dd")
+    @Excel(name = "现聘岗位取得时间" ,dateFormat="yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date currentJobLevelAppointmentTime;
 
@@ -233,7 +233,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
      * 毕业时间1 年月
      */
     @Excel(name = "毕业时间1",dateFormat="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date graduationTime1;
 
     /**
@@ -251,7 +251,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
     /**
      * 毕业时间2年月
      */
-    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "毕业时间2",dateFormat="yyyy-MM-dd")
     private Date graduationTime2;
 
@@ -271,7 +271,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
      * 毕业时间3 年月
      */
     @Excel(name = "毕业时间3",dateFormat="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date graduationTime3;
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java

@@ -230,7 +230,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
               schoolCheckVo = checkeDicet("appointment_situation", date.getAppointmentSituation());
               if (schoolCheckVo !=null) {
                   if (schoolCheckVo.getFlag()) {
-                      date.setAppointmentPost(schoolCheckVo.getVal());
+                      date.setAppointmentSituation(schoolCheckVo.getVal());
                   } else {
                       sb.append(date.getName() + "用户 聘任情况 录入不符合选择项:" + schoolCheckVo.getVal());
                       sb.append("<br/>");