|
|
@ -490,6 +490,21 @@ func setDiffs( |
|
|
|
} |
|
|
|
diffs = append(diffs, diff) |
|
|
|
} |
|
|
|
} else { |
|
|
|
if colName == "上年年度考核结果" { |
|
|
|
v, e := khMap[zjkMap[key][colName]] |
|
|
|
if !e || jckMap[key][colName] != v { |
|
|
|
diff = Diff{ |
|
|
|
IDNumber: idNumber, |
|
|
|
Name: name, |
|
|
|
Work: work, |
|
|
|
ColName: colName, |
|
|
|
Jck: jckMap[key][colName], |
|
|
|
Zjk: zjkMap[key][colName], |
|
|
|
Gzk: gzkMap[key][colName], |
|
|
|
} |
|
|
|
diffs = append(diffs, diff) |
|
|
|
} |
|
|
|
} else { |
|
|
|
// 需要公共比较
|
|
|
|
if jckMap[key][colName] != zjkMap[key][colName] { |
|
|
@ -506,6 +521,7 @@ func setDiffs( |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return diffs |
|
|
|
} |
|
|
@ -564,8 +580,25 @@ func mergeCzResults(peoplesCzk, peoplesBhb []CzPerson) []Diff { |
|
|
|
|
|
|
|
// 示例数组
|
|
|
|
var gzMap map[string]bool |
|
|
|
var khMap map[string]string |
|
|
|
|
|
|
|
func init() { |
|
|
|
// khMap 考核
|
|
|
|
khMap = make(map[string]string) |
|
|
|
khMap["不称职(连续两年)"] = "不称职" |
|
|
|
khMap["不称职"] = "不称职" |
|
|
|
khMap["不定等次(病事假半年以上)"] = "病、事假累计超过考核年度半年不确定等次" |
|
|
|
khMap["不定等次(受处分)"] = "受政务处分期间年度考核不确定等次" |
|
|
|
khMap["不定等次(新录用公务员)"] = "新录用人员试用期年度考核不确定等次" |
|
|
|
khMap["不定等次(正在接受审查)"] = "被立案调查尚未结案年度考核不确定等次" |
|
|
|
khMap["无考核"] = "不进行考核" |
|
|
|
khMap["优秀(非连续三年)"] = "优秀" |
|
|
|
khMap["优秀(连续三年)"] = "优秀" |
|
|
|
khMap["称职"] = "称职" |
|
|
|
khMap["不定等次"] = "不定等次" |
|
|
|
khMap["基本称职"] = "基本称职" |
|
|
|
|
|
|
|
// ArrGz 不参与比较项
|
|
|
|
ArrGz := []string{"身份证号", "姓名", "最高学历", "现职务层次", "现职级层次"} |
|
|
|
// 将数组转换为 map
|
|
|
|
gzMap = make(map[string]bool) |
|
|
|