From 909ede976695eae0bebbe2fdc5eb402ea9bc673a Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Wed, 1 Jul 2020 17:15:30 +0800
Subject: [PATCH] 'commit'

---
 .../BaseStudentService/BaseStudentService.go  |  4 ++--
 .../BaseTeacherService/BaseTeacherService.go  | 24 +++++--------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go
index 25fe424f..1451e05d 100644
--- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go
+++ b/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)
+		model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
 		model.Xbm = xbm
 	} else {
-		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq+" 00:00:00")
 		model.Xbm = "1"
 	}
 	//民族 （有字典）
diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
index 0e84d692..698b345f 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
@@ -20,7 +20,6 @@ import (
 	"dsBaseRpc/Utils/PinYinUtil"
 	"dsBaseRpc/Utils/SqlKit"
 	"dsBaseRpc/models"
-	"time"
 )
 
 type Rpc struct{} //服务对象
@@ -103,7 +102,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		}
 		//根据身份证号，提取男女，出生日期
 		_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(in.Sfzjh)
-		model.Csrq = DateUtil.ConvertDateTime(birthday)
+		model.Csrq = DateUtil.ConvertDateTime(birthday + " 00:00:00")
 		//如果身份证与传入的性别代码不符
 		if xbm != in.Xbm {
 			reply.Success = false
@@ -112,7 +111,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq + " 00:00:00")
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm
@@ -126,18 +125,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
 	} else {
 		//如果只传了年和月，手工补上日和时间
-		if len(in.Cjny) == 7 {
-			in.Cjny = in.Cjny + "-01  00:00:00"
-			model.Cjny = DateUtil.ConvertDateTime(in.Cjny)
-		} else {
-			st, err := time.Parse(DateUtil.TimeLayoutStr, in.Cjny) //string转time
-			if err != nil {
-				reply.Success = false
-				reply.Message = "传入的从教年月格式不正确！"
-				return &reply, nil
-			}
-			model.Cjny = st
-		}
+		model.Cjny = DateUtil.ConvertDateTime( in.Cjny + "-01 00:00:00")
 	}
 	model.StageId = in.StageId
 	model.SubjectId = in.SubjectId
@@ -279,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)
+		model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
 		//如果身份证与传入的性别代码不符
 		if xbm != in.Xbm {
 			reply.Success = false
@@ -288,7 +276,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq+" 00:00:00")
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm
@@ -301,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)
+		model.Cjny = DateUtil.ConvertDateTime(in.Cjny+" 00:00:00")
 	}
 
 	model.StageId = in.StageId