'commit'

dsBaseRpc/Config/ImportExcelTemplate/student.json

@@ -45,7 +45,7 @@
       ]
     },
     {
-      "col_name": "证件类型码",
+      "col_name": "身份证件类型",
       "width": 20,
       "require": true,
       "level_1_sql": true,

dsBaseRpc/Config/ImportExcelTemplate/teacher.json

@@ -40,7 +40,7 @@
       ]
     },
     {
-      "col_name": "证件类型码",
+      "col_name": "身份证件类型",
       "width": 20,
       "require": true,
       "level_1_sql": true,

dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go

@@ -85,7 +85,11 @@ func (s *Rpc) AddBaseOrganization(ctx context.Context, in *BaseOrganizationProto
 	}
 	if exist {
 		reply.Success = false
-		reply.Message = "代码已存在，无法创建！"
+		if isBuMen {
+			reply.Message = "部门代码已存在，无法创建！"
+		} else {
+			reply.Message = "单位代码已存在，无法创建！"
+		}
 		return &reply, err
 	}
 
@@ -256,9 +260,9 @@ func (s *Rpc) DeleteBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 		if count > 0 {
 			reply.Success = false
 			//判断是单位还是部门
-			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId){
+			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId) {
 				reply.Message = "部门下存在教工数据，无法删除！"
-			}else{
+			} else {
 				reply.Message = "单位下存在教工数据，无法删除！"
 			}
 			return &reply, err
@@ -274,9 +278,9 @@ func (s *Rpc) DeleteBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 		if count > 0 {
 			reply.Success = false
 			//判断是单位还是部门
-			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId){
+			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId) {
 				reply.Message = "部门下存在子部门，无法删除！"
-			}else{
+			} else {
 				reply.Message = "单位下存在子部门，无法删除！"
 			}
 			return &reply, err
@@ -296,9 +300,9 @@ func (s *Rpc) DeleteBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 		if count > 0 {
 			reply.Success = false
 			//判断是单位还是部门
-			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId){
+			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId) {
 				reply.Message = "部门下存在班级，无法删除！"
-			}else{
+			} else {
 				reply.Message = "单位下存在班级，无法删除！"
 			}
 			return &reply, err
@@ -373,7 +377,12 @@ func (s *Rpc) UpdateBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 
 	if exist {
 		reply.Success = false
-		reply.Message = "代码已存在，无法修改！"
+		if BaseOrganizationDao.IsBuMen(in.OrgId){
+			reply.Message = "部门代码已存在，无法修改！"
+		}else{
+			reply.Message = "部门代码已存在，无法修改！"
+		}
+
 		return &reply, err
 	}
 	//2、检查机构名称是否存在,否则在导入人员时，不知道向哪个单位下进行导入
@@ -386,9 +395,9 @@ func (s *Rpc) UpdateBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 	}
 	if exist {
 		reply.Success = false
-		if BaseOrganizationDao.IsBuMen(in.OrgId){
+		if BaseOrganizationDao.IsBuMen(in.OrgId) {
 			reply.Message = "部门名称已存在，无法修改！"
-		}else{
+		} else {
 			reply.Message = "单位名称已存在，无法修改！"
 		}
 		return &reply, err

dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go

@@ -449,7 +449,7 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapClass map[stri
 					pass = false
 				}
 			}
-			//(6)证件类型码
+			//(6)身份证件类型
 			if j == 6 {
 				if _, ok := SysDictKit.MapDictKindChineseToCode["sfzjlxm_"+row[j]]; !ok {
 					pass = false

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -677,7 +677,7 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[st
 					pass = false
 				}
 			}
-			//(4)证件类型码
+			//(4)身份证件类型
 			if j == 4 {
 				if _, ok := SysDictKit.MapDictKindChineseToCode["sfzjlxm_"+row[j]]; !ok {
 					pass = false

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go

@@ -21,6 +21,7 @@ import (
 	"dsBaseRpc/Utils/PinYinUtil"
 	"dsBaseRpc/Utils/SqlKit"
 	"dsBaseRpc/models"
+	"time"
 )
 
 type Rpc struct{} //服务对象
@@ -31,7 +32,12 @@ func (s *Rpc) GetBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 	var reply BaseTeacherProto.Reply
 	//通用获取单条
 	list := SqlKit.QueryByIds([]string{in.PersonId}, "t_base_teacher")
-
+	//处理从教年月
+	if len(list)>0{
+		if list[0]["csrq"].(time.Time).Year()==1900{
+			list[0]["csrq"]=""
+		}
+	}
 	//将结果序列化
 	reply.Success = true
 	reply.Count = 1
@@ -263,7 +269,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
 	model.Xm = in.Xm
 	model.Xmpy = PinYinUtil.PinYin(in.Xmpy)
 	model.Cym = in.Cym
-	//身份证件类型码
+	//身份证件类型
 	model.Sfzjlxm = in.Sfzjlxm
 	model.Sfzjh = in.Sfzjh
 	//如果是身份证