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

---
 .../BaseStudent/BaseStudentService/BaseStudentService.go    | 4 ++--
 .../BaseTeacher/BaseTeacherService/BaseTeacherService.go    | 4 ++--
 dsBaseRpc/Utils/CommonUtil/CommonUtil.go                    | 6 ------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go
index 3c9e9f06..10938f97 100644
--- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go
+++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go
@@ -83,7 +83,7 @@ func (s *Rpc) AddBaseStudent(ctx context.Context, in *BaseStudentProto.ModelArg)
 		model.Csrq = DateUtil.ConvertDateTime(birthday)
 		model.Xbm = xbm
 	} else {
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = "1"
 	}
 	//民族 （有字典）
@@ -268,7 +268,7 @@ func (s *Rpc) UpdateBaseStudent(ctx context.Context, in *BaseStudentProto.ModelA
 		model.Xbm = xbm
 	} else {
 		//如果不是身份证号，那就用个默认值吧
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = "1"
 	}
 	model.PersonId = in.PersonId
diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
index 8f39ac88..0e84d692 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
@@ -112,7 +112,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm
@@ -288,7 +288,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 		}
 		model.Xbm = xbm
 	} else {
-		model.Csrq = CommonUtil.ConvertStringToTime(in.Csrq)
+		model.Csrq = DateUtil.ConvertDateTime(in.Csrq)
 		model.Xbm = in.Xbm
 	}
 	model.Mzm = in.Mzm
diff --git a/dsBaseRpc/Utils/CommonUtil/CommonUtil.go b/dsBaseRpc/Utils/CommonUtil/CommonUtil.go
index b9971f59..03718141 100644
--- a/dsBaseRpc/Utils/CommonUtil/CommonUtil.go
+++ b/dsBaseRpc/Utils/CommonUtil/CommonUtil.go
@@ -631,9 +631,3 @@ func CopyFields(sourceStruct interface{}, targetStruct interface{}, fields ...st
 	}
 	return
 }
-
-//将字符串转化为时间格式
-func ConvertStringToTime(str string) time.Time {
-	t, _ := time.ParseInLocation("2006-01-02", str, time.Local)
-	return t
-}