12.27修改教师基础信息

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

@@ -61,8 +61,7 @@ public class SchoolAclassTeacherAssessmentExport extends BaseEntity
     private String classType;
 
     /** 学科(下拉框) */
-    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
-            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
+    @Excel(name = "学科",dictType = "sub_dzdn")
     private String sub;
 
     /** 备注*/

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

@@ -33,8 +33,7 @@ public class SchoolAworkloadDc extends BaseEntity {
     private String name;
 
     /** 学科(下拉框) */
-    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
-            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
+    @Excel(name = "学科", dictType = "sub_dzdn")
     private String sub;
 
     /** 身份证号 */

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

@@ -80,8 +80,11 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
                 date.setFileAge(age);
             }
             //3.到二中工作年限
-            int gl = this.workAge(sdf.parse(format),date.getToSecondMiddleSchoolTime());
-            date.setToSecondAge(gl);
+            if (StringUtils.isNotNull(date.getToSecondMiddleSchoolTime())){
+                int gl = this.workAge(sdf.parse(format),date.getToSecondMiddleSchoolTime());
+                date.setToSecondAge(gl);
+            }
+
         }
         return list;
     }
@@ -186,11 +189,11 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
                     sb.append(index+ "、用户手机号不可为空");
                     sb.append("<br/>");
                 }
-                //到二中工作日期
-                if (null == date.getToSecondMiddleSchoolTime()) {
-                    sb.append(index+ "、二中工作日期不可为空 || 数据填写不规范");
-                    sb.append("<br/>");
-                }
+//                //到二中工作日期
+//                if (null == date.getToSecondMiddleSchoolTime()) {
+//                    sb.append(index+ "、二中工作日期不可为空 || 数据填写不规范");
+//                    sb.append("<br/>");
+//                }
             }
                 if (!StringUtils.isEmpty(sb.toString())){
                     return sb.toString();
@@ -338,13 +341,16 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
                 }
 
                 //到二中工作时间
-                schoolCheckVo = this.checkeDateTime(date.getToSecondMiddleSchoolTime());
-                if (schoolCheckVo.getFlag()){
-                    date.setToSecondMiddleSchoolTime(schoolCheckVo.getDate());
-                }else {
-                    sb.append(date.getName()+"用户到二中工作时间格式错误" );
-                    sb.append("<br/>");
+                if(StringUtils.isNotNull(date.getToSecondMiddleSchoolTime())){
+                    schoolCheckVo = this.checkeDateTime(date.getToSecondMiddleSchoolTime());
+                    if (schoolCheckVo.getFlag()){
+                        date.setToSecondMiddleSchoolTime(schoolCheckVo.getDate());
+                    }else {
+                        sb.append(date.getName()+"用户到二中工作时间格式错误" );
+                        sb.append("<br/>");
+                    }
                 }
+
                 //在岗情况
                 schoolCheckVo = checkeDicet("duty_situation", date.getOnDutySituation());
                 if (schoolCheckVo !=null) {
@@ -473,8 +479,11 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
             schoolTeacherBasicInformation.setFileAge(age);
         }
         //3.到二中工作年限
-        int nl = this.workAge(sdf.parse(format),schoolTeacherBasicInformation.getToSecondMiddleSchoolTime());
-        schoolTeacherBasicInformation.setToSecondAge(nl);
+        if (StringUtils.isNotNull(schoolTeacherBasicInformation.getToSecondMiddleSchoolTime())){
+            int nl = this.workAge(sdf.parse(format),schoolTeacherBasicInformation.getToSecondMiddleSchoolTime());
+            schoolTeacherBasicInformation.setToSecondAge(nl);
+        }
+
         //4. 工作年龄
         if (null != schoolTeacherBasicInformation.getLengthOfServiceTime()){
             int gl = this.workAge(sdf.parse(format),schoolTeacherBasicInformation.getLengthOfServiceTime());

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXteachingAchievementsVo.java

@@ -61,8 +61,7 @@ public class SchoolXteachingAchievementsVo {
     private String idCard;
 
     /** 学科 */
-    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
-            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
+    @Excel(name = "学科", dictType = "sub_dzdn")
     private String sub;
 
     /** 班级 */