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

Merge branch 'master' of 10.10.14.250:huanghai/dsMin

Browse Source
master
wubin 5 years ago
parent ebb81e0453 cad37fafd1
commit 63c3a39cd9
8 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
Unescape View File

@ -622,7 +622,7 @@ func UpdateManager(bureauId string, bUse int32) error {
model.Xmpy = PinYinUtil.PinYin(model.Xm)
model.Cym = model.Xm
model.Xbm = "男"
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 07:25:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Mzm = "1"
model.Zzmmm = "13"
model.Sfzjlxm = "4"
@ -631,7 +631,7 @@ func UpdateManager(bureauId string, bUse int32) error {
model.Xwm = "0"
model.Zcm = "5"
model.Bzlbm = "9"
model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1999-09-01")
model.StageId = "Z"
model.SubjectId = "99"
model.Gwzym = "80"

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

@ -705,11 +705,11 @@ func insertStudent(batchId string, bureauModel models.TBaseOrganization,actionPe
if model.Sfzjlxm == "1" {
//根据身份证号，提取男女，出生日期
_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(birthday)
model.Xbm = xbm
} else {
//如果不是身份证号，那就用个默认值吧
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Xbm = "1"
}
//民族
@ -820,11 +820,11 @@ func updateStudentImport(batchId string, bureauModel models.TBaseOrganization,ac
if model.Sfzjlxm == "1" {
//根据身份证号，提取男女，出生日期
_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(birthday)
model.Xbm = xbm
} else {
//如果不是身份证号，那就用个默认值吧
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Xbm = "1"
}
//排序号

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

@ -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+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(birthday)
model.Xbm = xbm
} else {
model.Csrq = DateUtil.ConvertDateTime(in.Csrq+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(in.Csrq)
model.Xbm = "1"
}
//民族 （有字典）
@ -264,11 +264,11 @@ func (s *Rpc) UpdateBaseStudent(ctx context.Context, in *BaseStudentProto.ModelA
}
//根据身份证号，提取男女，出生日期
_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(in.Sfzjh)
model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(birthday)
model.Xbm = xbm
} else {
//如果不是身份证号，那就用个默认值吧
model.Csrq = DateUtil.ConvertDateTime(in.Csrq+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(in.Csrq)
model.Xbm = "1"
}
model.PersonId = in.PersonId

12
dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
Unescape View File

@ -831,16 +831,16 @@ func insertTeacher(batchId string, bureauModel models.TBaseOrganization, actionP
//主校
model.MainSchoolId = bureauModel.MainSchoolId
//从教年月
model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1999-09-01")
//出生日期与性别
if model.Sfzjlxm == "1" {
//根据身份证号，提取男女，出生日期
_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(birthday)
model.Xbm = xbm
} else {
//如果不是身份证号，那就用个默认值吧
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Xbm = "1"
}
//排序号
@ -960,16 +960,16 @@ func updateTeacherImport(batchId string, bureauModel models.TBaseOrganization, a
//主校
model.MainSchoolId = bureauModel.MainSchoolId
//从教年月
model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1999-09-01")
//出生日期与性别
if model.Sfzjlxm == "1" {
//根据身份证号，提取男女，出生日期
_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(r1.Sfzjh)
model.Csrq = DateUtil.ConvertDateTime(birthday+" 00:00:00")
model.Csrq = DateUtil.ConvertDate(birthday)
model.Xbm = xbm
} else {
//如果不是身份证号，那就用个默认值吧
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 00:00:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Xbm = "1"
}
//排序号

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

@ -102,7 +102,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
}
//根据身份证号，提取男女，出生日期
_, birthday, xbm := IdCardUtil.GetIdCardNoInfo(in.Sfzjh)
model.Csrq = DateUtil.ConvertDateTime(birthday + " 00:00:00")
model.Csrq = DateUtil.ConvertDate(birthday)
//如果身份证与传入的性别代码不符
if xbm != in.Xbm {
reply.Success = false
@ -111,7 +111,7 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
}
model.Xbm = xbm
} else {
model.Csrq = DateUtil.ConvertDateTime(in.Csrq + " 00:00:00")
model.Csrq = DateUtil.ConvertDate(in.Csrq)
model.Xbm = in.Xbm
}
model.Mzm = in.Mzm
@ -122,10 +122,10 @@ func (s *Rpc) AddBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
model.StateId = 1
model.Bzlbm = in.Bzlbm
if len(in.Cjny) == 0 {
model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1900-01-01")
} else {
//如果只传了年和月，手工补上日和时间
model.Cjny = DateUtil.ConvertDateTime(in.Cjny + "-01 00:00:00")
model.Cjny = DateUtil.ConvertDate( in.Cjny + "-01")
}
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.ConvertDate(birthday)
//如果身份证与传入的性别代码不符
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.ConvertDate(in.Csrq)
model.Xbm = in.Xbm
}
model.Mzm = in.Mzm
@ -287,9 +287,9 @@ func (s *Rpc) UpdateBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelA
model.Bzlbm = in.Bzlbm
if len(in.Cjny) == 0 {
model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1900-01-01")
} else {
model.Cjny = DateUtil.ConvertDateTime(in.Cjny + "-01 00:00:00")
model.Cjny = DateUtil.ConvertDate(in.Cjny+"-01")
}
model.StageId = in.StageId

4
dsBaseRpc/Tools/MockData/MockData.go
Unescape View File

@ -174,7 +174,7 @@ func addManager(bureauId string, bureauName string, orgType int32, ProvinceCode
model.Xwm = "0"
model.Zcm = "5"
model.Bzlbm = "9"
model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1999-09-01")
model.StageId = "Z"
model.SubjectId = "99"
model.Gwzym = "80"
@ -280,7 +280,7 @@ func addTeacher(bureauId string, provinceCode string, cityCode string, districtC
model.Zcm = "5"
model.StateId = 1
model.Bzlbm = "9"
model.Cjny = DateUtil.ConvertDateTime("1900-01-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1900-01-01")
model.StageId = "Z"
model.SubjectId = "99"
model.Gwzym = "80"

22
dsBaseRpc/Tools/SystemAccount/SystemAccount.go
Unescape View File

@ -81,7 +81,7 @@ func AddVirtualManager(areaCode string, areaName string) {
model.Xmpy = PinYinUtil.PinYin(model.Xm)
model.Cym = model.Xm
model.Xbm = "男"
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 07:25:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Mzm = "1"
model.Zzmmm = "13"
model.Sfzjlxm = "4"
@ -90,7 +90,7 @@ func AddVirtualManager(areaCode string, areaName string) {
model.Xwm = "0"
model.Zcm = "5"
model.Bzlbm = "9"
model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1999-09-01")
model.StageId = "Z"
model.SubjectId = "99"
model.Gwzym = "80"
@ -152,7 +152,7 @@ func AddWardManager(orgId string, orgName string, areaCode string) {
model.Xmpy = PinYinUtil.PinYin(model.Xm)
model.Cym = model.Xm
model.Xbm = "男"
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 07:25:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Mzm = "1"
model.Zzmmm = "13"
model.Sfzjlxm = "4"
@ -161,7 +161,7 @@ func AddWardManager(orgId string, orgName string, areaCode string) {
model.Xwm = "0"
model.Zcm = "5"
model.Bzlbm = "9"
model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1999-09-01")
model.StageId = "Z"
model.SubjectId = "99"
model.Gwzym = "80"
@ -217,7 +217,7 @@ func AddSuperManager() {
model.Xmpy = PinYinUtil.PinYin(model.Xm)
model.Cym = model.Xm
model.Xbm = "男"
model.Csrq = DateUtil.ConvertDateTime("1977-10-11 07:25:00")
model.Csrq = DateUtil.ConvertDate("1977-10-11")
model.Mzm = "1"
model.Zzmmm = "13"
model.Sfzjlxm = "4"
@ -226,7 +226,7 @@ func AddSuperManager() {
model.Xwm = "0"
model.Zcm = "5"
model.Bzlbm = "9"
model.Cjny = DateUtil.ConvertDateTime("1999-09-01 00:00:00")
model.Cjny = DateUtil.ConvertDate("1999-09-01")
model.StageId = "Z"
model.SubjectId = "99"
model.Gwzym = "80"
@ -264,9 +264,6 @@ func AddSuperManager() {
arrayTBaseRolePerson = append(arrayTBaseRolePerson, *modelBaseRolePerson)
}
var _ProvinceMap = make(map[string]string)
var _CityMap = make(map[string]string)
func main() {
//禁用外键约束
sql := "SET foreign_key_checks = 0"
@ -411,7 +408,7 @@ func main() {
organization.OrgLat = 0
organization.OrgLng = 0
shengCode := list[i]["area_code"].(string)[0:2] + "0000"
organization.ParentId = _ProvinceMap[shengCode]
organization.ParentId = Const.ZeroGuid
organization.OrgId = shiId
organization.ManageOrgId = _ProvinceMap[shengCode]
organization.OrgName = list[i]["area_name"].(string) + "教育局"
@ -427,9 +424,6 @@ func main() {
//生成市教育局管理员
AddWardManager(organization.OrgId, organization.OrgName, organization.AreaCode)
//放入市map
_CityMap[list[i]["area_code"].(string)] = shiId
}
} else { //县区
//添加县区教育局
@ -452,7 +446,7 @@ func main() {
organization.OrgCode = CommonUtil.GetUUID()[0:30]
organization.OrgLat = 0
organization.OrgLng = 0
organization.ParentId = _CityMap[cityCode]
organization.ParentId = Const.ZeroGuid
organization.OrgId = quId
shengCode := list[i]["area_code"].(string)[0:2] + "0000"
organization.ManageOrgId = organization.OrgId

8
dsBaseRpc/Utils/DateUtil/DateUtil.go
Unescape View File

@ -11,13 +11,17 @@ func GetCurrentTimeStr() string {
return time.Now().Format("20060102150405")
}
const TimeLayoutStr= "2006-01-02 15:04:05" //go中的时间格式化必须是这个时间
const TimeLayoutStr = "2006-01-02 15:04:05" //go中的时间格式化必须是这个时间
/**
功能：将一个字符串转为对应的时间
作者:黄海
时间：2020-05-29
*/
func ConvertDateTime(ts string) time.Time {
st, _ := time.Parse(TimeLayoutStr, ts) //string转time
st, _ := time.Parse(TimeLayoutStr, ts) //string转time
return st
}
func ConvertDate(ts string) time.Time {
return ConvertDateTime(ts + " 00:00:00")
}

Write Preview
Loading…
Cancel
Save