格式化代码

src/history/util_history.go

@@ -67,7 +67,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 					tmp_nkw := nkw_addArr[0]
 					if tmp_nkw != "" {
 						cr := &CommonReg{}
-						cr.CsVal = tmp_nkw //记录原值
+						cr.CsVal = tmp_nkw                   //记录原值
 						if LetterCase.MatchString(tmp_nkw) { //判断附加词中是否有英文
 							tmp_nkw = strings.ToUpper(tmp_nkw) //附加词中有英文全部转为大写
 							cr.IsLetter = true                 //含字母
@@ -119,7 +119,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 				tmp_aw := aw_addArr[0]
 				if tmp_aw != "" {
 					cr := &CommonReg{}
-					cr.CsVal = tmp_aw //记录原值
+					cr.CsVal = tmp_aw                   //记录原值
 					if LetterCase.MatchString(tmp_aw) { //判断附加词中是否有英文
 						tmp_aw = strings.ToUpper(tmp_aw) //附加词中有英文全部转为大写
 						cr.IsLetter = true               //含字母
@@ -353,7 +353,7 @@ func RegMatch(fieldText map[string]interface{}, matchType []string, matchReg *Re
 				for n, arc := range ar.AndRegKid { //ar.AndRegKid若有值必不小于2
 					if indexArr := arc.CrVal.FindAllStringIndex(text, -1); len(indexArr) < 1 { //匹配失败(ar.AndRegKid中任意一个未匹配则失败)
 						break
-					} else { //匹配成功，判断字母
+					} else {                                                         //匹配成功，判断字母
 						if arc.IsLetter && !CheckLetter(text, arc.CrVal, indexArr) { //reg有字母，判断是否是包含关系(AAAIBBB or AI)
 							break
 						}
@@ -1011,7 +1011,7 @@ func RegMatchTest(fieldText map[string]interface{}, matchType []string, matchReg
 					qu.Debug("nnnn---", n, arc.CrVal, arc.IsLetter)
 					if indexArr := arc.CrVal.FindAllStringIndex(text, -1); len(indexArr) < 1 { //匹配失败(ar.AndRegKid中任意一个未匹配则失败)
 						break
-					} else { //匹配成功，判断字母
+					} else {                                                         //匹配成功，判断字母
 						if arc.IsLetter && !CheckLetter(text, arc.CrVal, indexArr) { //reg有字母，判断是否是包含关系(AAAIBBB or AI)
 							break
 						}
@@ -1280,7 +1280,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 					row.AddCell().SetValue(v["projectname"]) //项目名称
 					row.AddCell().SetValue(v["buyer"])       //采购单位
 					row.AddCell().SetValue(v["buyer_type"])  //采购单位类别---私有标签tagname
-					if v["bidamount"] != nil { //中标金额
+					if v["bidamount"] != nil {               //中标金额
 						row.AddCell().SetFloat(qu.Float64All(v["bidamount"]))
 					} else {
 						row.AddCell()
@@ -1338,8 +1338,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 				}
 			}
 			//fname := t + ".xlsx"
-			fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t,qu.GetRandom(4))
-			log.Println("fname",fname)
+			fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t, qu.GetRandom(4))
+			log.Println("fname", fname)
 			err = xf.Save(dir + fname)
 			if err != nil {
 				log.Println("xls error", fname)

src/service/second_push.go

@@ -728,7 +728,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					log.Println("mkdir err", dir)
 				}
 			}
-			fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t,qu.GetRandom(4))
+			fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t, qu.GetRandom(4))
 			log.Println("fname", fname)
 			err = newFile.Save(dir + fname)
 			if err != nil {

src/util/parsxlsx.go

@@ -287,7 +287,7 @@ func ResponseXlsx_Data(id string) string {
 				xf.Sheets = xf.Sheets[:1]
 				xf.Sheets[0].Name = "详细数据"
 				t := time.Now().Format("20060102")
-				fname := fmt.Sprintf(bzpath, ruleName, t,util.GetRandom(4))
+				fname := fmt.Sprintf(bzpath, ruleName, t, util.GetRandom(4))
 				err := xf.Save(fname)
 				if err != nil {
 					log.Println(err)
@@ -346,7 +346,7 @@ func ResponseXlsx_Data(id string) string {
 				xf.Sheets = xf.Sheets[1:2]
 				xf.Sheets[0].Name = "详细数据"
 				t := time.Now().Format("20060102")
-				fname := fmt.Sprintf(gjpath, ruleName, t,util.GetRandom(4))
+				fname := fmt.Sprintf(gjpath, ruleName, t, util.GetRandom(4))
 				err := xf.Save(fname)
 				if err != nil {
 					log.Println(err)
@@ -423,7 +423,7 @@ func ResponseXlsx_Rule(id string) string {
 	}
 	ruleName := (*data)["s_name"]
 	t := time.Now().Format("20060102")
-	fname := fmt.Sprintf(rpath, ruleName, t,util.GetRandom(4))
+	fname := fmt.Sprintf(rpath, ruleName, t, util.GetRandom(4))
 	xf.Save(fname)
 	return fname
 }