提交原本的修改

main.go

@@ -8,14 +8,18 @@ import (
 )
 
 //
-var origin_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码2\\表2_国考_20190322192526接受替换.xlsx"
-var reference_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码2\\表1_国考_代号转换表.xlsx"
-var result_file = "./result2.xlsx"
+//var origin_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码2\\表2_国考_20190322192526接受替换.xlsx"
+//var reference_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码2\\表1_国考_代号转换表.xlsx"
+//var result_file = "./result2.xlsx"
 
 //var origin_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码\\表2_招聘3-20180204145207_接受替换.xlsx"
 //var reference_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码\\表1_教师招聘_国考合并_替换代码.xlsx"
 //var result_file = "./result.xlsx"
 
+var origin_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码3\\表3_国考-招聘20190323155304标签3国考用招聘代号替换.xlsx"
+var reference_file = "C:\\Users\\tangs\\Desktop\\表1_教师招聘_国考合并_替换代码3\\表1_教师招聘_国考合并_替换代码.xlsx"
+var result_file = "./result3.xlsx"
+
 func compose_reference_file(reference_file string) map[string]map[string]string {
 	r_f, err := xlsx.OpenFile(reference_file)
 	if err != nil {
@@ -87,8 +91,8 @@ func compose_reference_file2(reference_file string) map[string]string {
 func swap(origin_file, reference_file string) {
 
 	//
-	//reference := compose_reference_file(reference_file)
-	reference := compose_reference_file2(reference_file)
+	reference := compose_reference_file(reference_file)
+	//reference := compose_reference_file2(reference_file)
 	bys, _ := json.Marshal(reference)
 	fmt.Println(string(bys))
 
@@ -111,9 +115,9 @@ func swap(origin_file, reference_file string) {
 			value = strings.Replace(value, "—", "-", -1)
 			value = strings.Replace(value, "，", ",", -1)
 			new_value := value
-			//new_value = real_swap(value, reference, true)
-			//new_value = real_swap(new_value, reference, false)
-			new_value = real_swap2(value, reference)
+			new_value = real_swap(value, reference, true)
+			new_value = real_swap(new_value, reference, false)
+			//new_value = real_swap2(value, reference)
 			fmt.Println(new_value)
 			cell.Value = new_value
 		}