diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go index b885ba09..302d2e16 100644 --- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go +++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go @@ -728,26 +728,39 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[st pass = false } } - //(2)民族 + //(2)性别 if j == 2 { - if _, ok := SysDictKit.MapDictKindChineseToCode["mzm_"+row[j]]; !ok { + if row[j] != "男" && row[j] != "女" { pass = false } } - //(3)政治面貌 + //(3)出生日期 if j == 3 { - if _, ok := SysDictKit.MapDictKindChineseToCode["zzmmm_"+row[j]]; !ok { + //是不是合法出生日期 + if !DateUtil.CheckDateStr(row[j]) { pass = false } } - //(4)身份证件类型 + //(4)民族 if j == 4 { - if _, ok := SysDictKit.MapDictKindChineseToCode["sfzjlxm_"+row[j]]; !ok { + if _, ok := SysDictKit.MapDictKindChineseToCode["mzm_"+row[j]]; !ok { pass = false } } - //(5)身份证号 + //(5)政治面貌 if j == 5 { + if _, ok := SysDictKit.MapDictKindChineseToCode["zzmmm_"+row[j]]; !ok { + pass = false + } + } + //(6)身份证件类型 + if j == 6 { + if _, ok := SysDictKit.MapDictKindChineseToCode["sfzjlxm_"+row[j]]; !ok { + pass = false + } + } + //(7)身份证号 + if j == 7 { if row[j-1] == "居民身份证" && !CommonUtil.IsIdCard(CommonUtil.CompressStr(row[j])) { pass = false } @@ -756,44 +769,44 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[st } _idCardMap[CommonUtil.CompressStr(row[j])] = append(_idCardMap[CommonUtil.CompressStr(row[j])], i+1) } - //(6)学历 - if j == 6 { + //(8)学历 + if j == 8 { if _, ok := SysDictKit.MapDictKindChineseToCode["xlm_"+row[j]]; !ok { pass = false } } - //(7)学位 - if j == 7 { + //(9)学位 + if j == 9 { if _, ok := SysDictKit.MapDictKindChineseToCode["xwm_"+row[j]]; !ok { pass = false } } - //(8)职称 - if j == 8 { + //(10)职称 + if j == 10 { if _, ok := SysDictKit.MapDictKindChineseToCode["zcm_"+row[j]]; !ok { pass = false } } - //(9)编制 - if j == 9 { + //(11)编制 + if j == 11 { if _, ok := SysDictKit.MapDictKindChineseToCode["bzlbm_"+row[j]]; !ok { pass = false } } - //(10)任课学段 - if j == 10 { + //(12)任课学段 + if j == 12 { if _, ok := SysDictKit.MapStageNameToId[row[j]]; !ok { pass = false } } - //(11)任课学科 - if j == 11 { + //(13)任课学科 + if j == 13 { if _, ok := SysDictKit.MapStageSubjectNameExist[row[j-1]+"_"+row[j]]; !ok { pass = false } } - //(12)联系电话 - if j == 12 { + //(14)联系电话 + if j == 14 { if row[j] != "" { _mobileMap[row[j]] = append(_mobileMap[row[j]], i+1) } diff --git a/dsBaseRpc/Utils/DateUtil/DateUtil.go b/dsBaseRpc/Utils/DateUtil/DateUtil.go index 038b26a1..1c94595f 100644 --- a/dsBaseRpc/Utils/DateUtil/DateUtil.go +++ b/dsBaseRpc/Utils/DateUtil/DateUtil.go @@ -30,3 +30,22 @@ func ConvertDate(ts string) time.Time { return ConvertDateTime(ts + " 00:00:00") } } + +/** +功能:判断一个字符串是不是合法的日期格式 +作者:黄海 +时间:2020-08-18 + */ +func CheckDateStr(s string) bool { + //这种情况下,time.Parse会转成时间2014-03-01 00:00:00,有一个办法是,转换后如果没有报错,你再Format, + //跟原来的的对比一下,如果不同,那就可以是说是错误的。 + t, err := time.Parse("2006-01-02 15:04:05", s) + if err != nil { + return false + } + if s == t.Format("2006-01-02") { + return true + } else { + return false + } +}