|
|
|
@ -125,7 +125,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
|
|
|
|
|
model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
|
|
|
|
|
} else {
|
|
|
|
|
//如果只传了年和月,手工补上日和时间
|
|
|
|
|
model.Cjny = DateUtil.ConvertDateTime( in.Cjny + "-01 00:00:00")
|
|
|
|
|
model.Cjny = DateUtil.ConvertDateTime(in.Cjny + "-01 00:00:00")
|
|
|
|
|
}
|
|
|
|
|
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.ConvertDateTime(birthday + " 00:00:00")
|
|
|
|
|
//如果身份证与传入的性别代码不符
|
|
|
|
|
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.ConvertDateTime(in.Csrq + " 00:00:00")
|
|
|
|
|
model.Xbm = in.Xbm
|
|
|
|
|
}
|
|
|
|
|
model.Mzm = in.Mzm
|
|
|
|
@ -289,7 +289,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
|
|
|
|
|
if len(in.Cjny) == 0 {
|
|
|
|
|
model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
|
|
|
|
|
} else {
|
|
|
|
|
model.Cjny = DateUtil.ConvertDateTime(in.Cjny+"-01 00:00:00")
|
|
|
|
|
model.Cjny = DateUtil.ConvertDateTime(in.Cjny + "-01 00:00:00")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
model.StageId = in.StageId
|
|
|
|
|