bigdata
/
dsMin
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'commit'

Browse Source
master
huanghai 5 years ago
parent ac42d03608
commit dc4821eb0f
8 changed files with 256 additions and 256 deletions
Show Stats Download Patch File Download Diff File

2
dsBaseRpc/Config/ExportExcelTemplate/student_account.json
Unescape View File

@ -17,7 +17,7 @@
"width": 30
},
{
"col_name": "姓名",
"col_name": "学生姓名",
"col_field": "person_name",
"width": 30
},

6
dsBaseRpc/Config/ExportExcelTemplate/teacher_account.json
Unescape View File

@ -7,17 +7,17 @@
"width": 20
},
{
"col_name": "部门",
"col_name": "所属部门",
"col_field": "org_name",
"width": 30
},
{
"col_name": "姓名",
"col_name": "教职工姓名",
"col_field": "person_name",
"width": 20
},
{
"col_name": "登录名",
"col_name": "登录账号",
"col_field": "login_name",
"width": 30
},

234
dsBaseRpc/Config/ImportExcelTemplate/student.json
Unescape View File

@ -1,118 +1,118 @@
{
"title": "学生信息导入",
"level_1_sql": [
"select dict_value from t_sys_dict where dict_kind =? order by sort_id"
],
"cols": [
{
"col_name": "学部",
"width": 16,
"require": true
},
{
"col_name": "入学年份",
"width": 16,
"require": true
},
{
"col_name": "班号",
"width": 16,
"require": true
},
{
"col_name": "姓名",
"width": 16,
"require": true
},
{
"col_name": "民族",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"mzm"
]
},
{
"col_name": "政治面貌",
"width": 28,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"zzmmm"
]
},
{
"col_name": "证件类型码",
"width": 20,
"require": true,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"sfzjlxm"
]
},
{
"col_name": "身份证件号",
"width": 30,
"require": true
},
{
"col_name": "独生子女",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "随迁子女",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "务工子女",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "孤儿",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "留守儿童",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "残疾儿童",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
}
]
{
"title": "学生信息",
"level_1_sql": [
"select dict_value from t_sys_dict where dict_kind =? order by sort_id"
],
"cols": [
{
"col_name": "学部",
"width": 16,
"require": true
},
{
"col_name": "入学年份",
"width": 16,
"require": true
},
{
"col_name": "班号",
"width": 16,
"require": true
},
{
"col_name": "姓名",
"width": 16,
"require": true
},
{
"col_name": "民族",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"mzm"
]
},
{
"col_name": "政治面貌",
"width": 28,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"zzmmm"
]
},
{
"col_name": "证件类型码",
"width": 20,
"require": true,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"sfzjlxm"
]
},
{
"col_name": "身份证件号",
"width": 30,
"require": true
},
{
"col_name": "独生子女",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "随迁子女",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "务工子女",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "孤儿",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "留守儿童",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
},
{
"col_name": "残疾儿童",
"width": 15,
"require": true,
"range": [
"否",
"是"
]
}
]
}

252
dsBaseRpc/Config/ImportExcelTemplate/teacher.json
Unescape View File

@ -1,127 +1,127 @@
{
"title": "教工信息导入",
"level_1_sql": [
"select dict_value from t_sys_dict where dict_kind =? order by sort_id"
],
"level_2_sql": [
[
"select stage_name as dict_value from t_dm_stage where b_use=1 order by sort_id",
"select subject_name as dict_value from t_dm_subject where subject_id in (select subject_id from t_dm_stage_subject where stage_id=(select stage_id from t_dm_stage where stage_name=?) and b_use=1)"
]
],
"cols": [
{
"col_name": "部门",
"width": 28
},
{
"col_name": "姓名",
"width": 16,
"require": true
},
{
"col_name": "民族",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"mzm"
]
},
{
"col_name": "政治面貌",
"width": 28,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"zzmmm"
]
},
{
"col_name": "证件类型码",
"width": 20,
"require": true,
"level_1_sql": true,
"sql_num": 1,
"sql_parameter": [
"sfzjlxm"
]
},
{
"col_name": "身份证件号",
"width": 30,
"require": true
},
{
"col_name": "学历",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"xlm"
]
},
{
"col_name": "学位",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"xwm"
]
},
{
"col_name": "职称",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"zcm"
]
},
{
"col_name": "编制",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"bzlbm"
]
},
{
"col_name": "岗位",
"level_1_sql": true,
"width": 16,
"require": true,
"sql_num": 1,
"sql_parameter": [
"gwzym"
]
},
{
"col_name": "任课学段",
"require": true,
"width": 26
},
{
"col_name": "任课学科",
"level_1_sql": false,
"require": true,
"width": 26
},
{
"col_name": "联系电话",
"width": 20
},
{
"col_name": "电子信箱",
"width": 30
}
]
{
"title": "教工信息",
"level_1_sql": [
"select dict_value from t_sys_dict where dict_kind =? order by sort_id"
],
"level_2_sql": [
[
"select stage_name as dict_value from t_dm_stage where b_use=1 order by sort_id",
"select subject_name as dict_value from t_dm_subject where subject_id in (select subject_id from t_dm_stage_subject where stage_id=(select stage_id from t_dm_stage where stage_name=?) and b_use=1)"
]
],
"cols": [
{
"col_name": "部门",
"width": 28
},
{
"col_name": "姓名",
"width": 16,
"require": true
},
{
"col_name": "民族",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"mzm"
]
},
{
"col_name": "政治面貌",
"width": 28,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"zzmmm"
]
},
{
"col_name": "证件类型码",
"width": 20,
"require": true,
"level_1_sql": true,
"sql_num": 1,
"sql_parameter": [
"sfzjlxm"
]
},
{
"col_name": "身份证件号",
"width": 30,
"require": true
},
{
"col_name": "学历",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"xlm"
]
},
{
"col_name": "学位",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"xwm"
]
},
{
"col_name": "职称",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"zcm"
]
},
{
"col_name": "编制",
"width": 16,
"level_1_sql": true,
"require": true,
"sql_num": 1,
"sql_parameter": [
"bzlbm"
]
},
{
"col_name": "岗位",
"level_1_sql": true,
"width": 16,
"require": true,
"sql_num": 1,
"sql_parameter": [
"gwzym"
]
},
{
"col_name": "任课学段",
"require": true,
"width": 26
},
{
"col_name": "任课学科",
"level_1_sql": false,
"require": true,
"width": 26
},
{
"col_name": "联系电话",
"width": 20
},
{
"col_name": "电子信箱",
"width": 30
}
]
}

4
dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
Unescape View File

@ -63,7 +63,7 @@ func UpdateBaseStudent(model models.TBaseStudent, ForceUpdateFields []string) (i
var ids = []string{model.PersonId}
var selector = SqlKit.GetBean("t_base_student")
SqlKit.DeleteCacheByIds(ids, selector)
//更改登录表中的教师姓名
//更改登录表中的学生姓名
SysLoginpersonDao.UpdatePersonName(model.PersonId, model.Xm)
//2、计算本次操作，有哪些字段需要更新
NeedUpdateFields := CommonUtil.GetNeedUpdateFields(model)
@ -144,7 +144,7 @@ func ExportStudentAccountInfoExcel(in *BaseStudentProto.ModelArg) ([]map[string]
classIds = append(classIds, in.ClassId)
myBuilder.And(builder.In("t3.class_id", classIds))
}
myBuilder.OrderBy("t3.stage_id").OrderBy("t3.id_int")
myBuilder.OrderBy("t3.stage_id").OrderBy("t3.id_int").OrderBy("t2.id_int")
sql, err := myBuilder.ToBoundSQL()
if err != nil {
return nil, 0, err

6
dsBaseRpc/RpcService/BaseStudent/BaseStudentService/BaseStudentService.go
Unescape View File

@ -51,7 +51,7 @@ func (s *Rpc) AddBaseStudent(ctx context.Context, in *BaseStudentProto.ModelArg)
//是不是重复
if !SysLoginpersonDao.IsValidIdCardNo(in.Sfzjh, "") {
reply.Success = false
reply.Message = "唯一身份标识在系统中已存在，无法创建！"
reply.Message = "证件号在系统中已存在，无法创建！"
return &reply, nil
}
//==========================================
@ -84,7 +84,7 @@ func (s *Rpc) AddBaseStudent(ctx context.Context, in *BaseStudentProto.ModelArg)
model.Xbm = xbm
} else {
model.Csrq = DateUtil.ConvertDate(in.Csrq)
model.Xbm = "1"
model.Xbm = in.Xbm
}
//民族 （有字典）
model.Mzm = in.Mzm
@ -245,7 +245,7 @@ func (s *Rpc) UpdateBaseStudent(ctx context.Context, in *BaseStudentProto.ModelA
//是不是重复
if !SysLoginpersonDao.IsValidIdCardNo(in.Sfzjh, in.PersonId) {
reply.Success = false
reply.Message = "唯一身份标识在系统中已存在，无法创建！"
reply.Message = "证件号在系统中已存在，无法创建！"
return &reply, nil
}
//==========================================

4
dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go
Unescape View File

@ -55,7 +55,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
//是不是重复
if !SysLoginpersonDao.IsValidIdCardNo(in.Sfzjh, "") {
reply.Success = false
reply.Message = "唯一身份标识在系统中已存在，无法创建！"
reply.Message = "证件号在系统中已存在，无法创建！"
return &reply, nil
}
//==========================================
@ -228,7 +228,7 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
//是不是重复
if !SysLoginpersonDao.IsValidIdCardNo(in.Sfzjh, in.PersonId) {
reply.Success = false
reply.Message = "唯一身份标识在系统中已存在，无法创建！"
reply.Message = "证件号在系统中已存在，无法创建！"
return &reply, nil
}

4
dsBaseRpc/Test/excel_test.go
Unescape View File

@ -13,8 +13,8 @@ func TestStyle(t *testing.T) {
tPath := `E:\Work\dsMin\dsBaseRpc\Config\ImportExcelTemplate\teacher2222.xlsx`
f, _ := excelize.OpenFile(excelPath)
style, _ := f.GetCellStyle("教工信息导入", Const.RedCell)
f.SetCellStyle("教工信息导入", "A202", "A202", style)
style, _ := f.GetCellStyle("教工信息", Const.RedCell)
f.SetCellStyle("教工信息", "A202", "A202", style)
if err := f.SaveAs(tPath); err != nil {
println(err.Error())

Write Preview
Loading…
Cancel
Save