'commit'

dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go

@@ -622,7 +622,7 @@ func UpdateManager(bureauId string, bUse int32) error {
 		model.Xmpy = PinYinUtil.PinYin(model.Xm)
 		model.Cym = model.Xm
 		model.Xbm = "男"
-		model.Csrq = DateUtil.ConvertDateTime("1977-10-11 07:25:00")
+		model.Csrq = DateUtil.ConvertDate("1977-10-11")
 		model.Mzm = "1"
 		model.Zzmmm = "13"
 		model.Sfzjlxm = "4"
@@ -631,7 +631,7 @@ func UpdateManager(bureauId string, bUse int32) error {
 		model.Xwm = "0"
 		model.Zcm = "5"
 		model.Bzlbm = "9"
-		model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
+		model.Cjny = DateUtil.ConvertDate("1999-09-01")
 		model.StageId = "Z"
 		model.SubjectId = "99"
 		model.Gwzym = "80"

dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go

@@ -705,11 +705,11 @@ func insertStudent(batchId string, bureauModel models.TBaseOrganization,actionPe
 		if model.Sfzjlxm == "1" {
 			//根据身份证号，提取男女，出生日期
 			_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
-			model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
+			model.Csrq = DateUtil.ConvertDate(birthday)
 			model.Xbm = xbm
 		} else {
 			//如果不是身份证号，那就用个默认值吧
-			model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
+			model.Csrq = DateUtil.ConvertDate("1977-10-11")
 			model.Xbm = "1"
 		}
 		//民族
@@ -820,11 +820,11 @@ func updateStudentImport(batchId string, bureauModel models.TBaseOrganization,ac
 		if model.Sfzjlxm == "1" {
 			//根据身份证号，提取男女，出生日期
 			_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
-			model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
+			model.Csrq = DateUtil.ConvertDate(birthday)
 			model.Xbm = xbm
 		} else {
 			//如果不是身份证号，那就用个默认值吧
-			model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
+			model.Csrq = DateUtil.ConvertDate("1977-10-11")
 			model.Xbm = "1"
 		}
 		//排序号

dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go

@@ -80,10 +80,10 @@ func (s *Rpc) AddBaseStudent(ctx context.Context, in *BaseStudentProto.ModelArg)
 		}
 		//根据身份证号，提取男女，出生日期
 		_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(in.Sfzjh)
-		model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(birthday)
 		model.Xbm = xbm
 	} else {
-		model.Csrq = DateUtil.ConvertDateTime(in.Csrq+" 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(in.Csrq)
 		model.Xbm = "1"
 	}
 	//民族 （有字典）
@@ -264,11 +264,11 @@ func (s *Rpc) UpdateBaseStudent(ctx context.Context, in *BaseStudentProto.ModelA
 		}
 		//根据身份证号，提取男女，出生日期
 		_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(in.Sfzjh)
-		model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(birthday)
 		model.Xbm = xbm
 	} else {
 		//如果不是身份证号，那就用个默认值吧
-		model.Csrq = DateUtil.ConvertDateTime(in.Csrq+" 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(in.Csrq)
 		model.Xbm = "1"
 	}
 	model.PersonId = in.PersonId

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -831,16 +831,16 @@ func insertTeacher(batchId string, bureauModel models.TBaseOrganization, actionP
 		//主校
 		model.MainSchoolId = bureauModel.MainSchoolId
 		//从教年月
-		model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
+		model.Cjny = DateUtil.ConvertDate("1999-09-01")
 		//出生日期与性别
 		if model.Sfzjlxm == "1" {
 			//根据身份证号，提取男女，出生日期
 			_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
-			model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
+			model.Csrq = DateUtil.ConvertDate(birthday)
 			model.Xbm = xbm
 		} else {
 			//如果不是身份证号，那就用个默认值吧
-			model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
+			model.Csrq = DateUtil.ConvertDate("1977-10-11")
 			model.Xbm = "1"
 		}
 		//排序号
@@ -960,16 +960,16 @@ func updateTeacherImport(batchId string, bureauModel models.TBaseOrganization, a
 		//主校
 		model.MainSchoolId = bureauModel.MainSchoolId
 		//从教年月
-		model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
+		model.Cjny = DateUtil.ConvertDate("1999-09-01")
 		//出生日期与性别
 		if model.Sfzjlxm == "1" {
 			//根据身份证号，提取男女，出生日期
 			_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
-			model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
+			model.Csrq = DateUtil.ConvertDate(birthday)
 			model.Xbm = xbm
 		} else {
 			//如果不是身份证号，那就用个默认值吧
-			model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
+			model.Csrq = DateUtil.ConvertDate("1977-10-11")
 			model.Xbm = "1"
 		}
 		//排序号

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go

@@ -102,7 +102,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		}
 		//根据身份证号，提取男女，出生日期
 		_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(in.Sfzjh)
-		model.Csrq = DateUtil.ConvertDateTime(birthday + " 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(birthday)
 		//如果身份证与传入的性别代码不符
 		if xbm != in.Xbm {
 			reply.Success = false
@@ -111,7 +111,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = DateUtil.ConvertDateTime(in.Csrq + " 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(in.Csrq)
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm
@@ -122,10 +122,10 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 	model.StateId = 1
 	model.Bzlbm = in.Bzlbm
 	if len(in.Cjny) == 0 {
-		model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
+		model.Cjny = DateUtil.ConvertDate("1900-01-01")
 	} else {
 		//如果只传了年和月，手工补上日和时间
-		model.Cjny = DateUtil.ConvertDateTime( in.Cjny + "-01 00:00:00")
+		model.Cjny = DateUtil.ConvertDate( in.Cjny + "-01")
 	}
 	model.StageId = in.StageId
 	model.SubjectId = in.SubjectId
@@ -267,7 +267,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 	if model.Sfzjlxm == "1" {
 		//根据身份证号，提取男女，出生日期
 		_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(in.Sfzjh)
-		model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(birthday)
 		//如果身份证与传入的性别代码不符
 		if xbm != in.Xbm {
 			reply.Success = false
@@ -276,7 +276,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = DateUtil.ConvertDateTime(in.Csrq+" 00:00:00")
+		model.Csrq = DateUtil.ConvertDate(in.Csrq)
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm
@@ -287,9 +287,9 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 	model.Bzlbm = in.Bzlbm
 
 	if len(in.Cjny) == 0 {
-		model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
+		model.Cjny = DateUtil.ConvertDate("1900-01-01")
 	} else {
-		model.Cjny = DateUtil.ConvertDateTime(in.Cjny+"-01 00:00:00")
+		model.Cjny = DateUtil.ConvertDate(in.Cjny+"-01")
 	}
 
 	model.StageId = in.StageId

dsBaseRpc/Utils/DateUtil/DateUtil.go

@@ -17,7 +17,11 @@ const TimeLayoutStr= "2006-01-02 15:04:05" //go中的时间格式化必须是这
 作者:黄海
 时间：2020-05-29
 */
-func ConvertDateTime(ts string) time.Time {
-	st, _ := time.Parse(TimeLayoutStr, ts)    //string转time
+//func ConvertDateTime(ts string) time.Time {
+//	st, _ := time.Parse(TimeLayoutStr, ts)    //string转time
+//	return st
+//}
+func ConvertDate(ts string) time.Time {
+	st, _ := time.Parse(TimeLayoutStr, ts+" 00:00:00")    //string转time
 	return st
 }