111

src/jy/extract/extract.go

@@ -1716,7 +1716,7 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
 				break
 			}
 		}
-		if len(j.PackageInfo) >= 0 { //分包信息
+		if len(j.PackageInfo) > 0 { //分包信息
 			tmp["package"] = j.PackageInfo
 			//包预算，中标金额合并大于抽取就覆盖
 			var tmpBidamount, tmpBudget float64
@@ -1785,9 +1785,9 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
 			tmp["s_winner"] = tmp["winner"]
 		}
 		if len(j.Winnerorder) > 0 { //候选人信息
-			for i,v := range j.Winnerorder{
-				if v["price"]!= nil{
-					j.Winnerorder[i]["price"] = clear.ObjToMoney([]interface{}{v["price"],""})[0]
+			for i, v := range j.Winnerorder {
+				if v["price"] != nil {
+					j.Winnerorder[i]["price"] = clear.ObjToMoney([]interface{}{v["price"], ""})[0]
 				}
 			}
 			tmp["winnerorder"] = j.Winnerorder
@@ -2272,11 +2272,11 @@ func resetWinnerorder(j *ju.Job) {
 func RemoveReplicaSliceString(slc []string) []string {
 	result := make([]string, 0)
 	tempMap := make(map[string]bool, len(slc))
-	for _, e := range slc{
-		if tempMap[e] == false{
+	for _, e := range slc {
+		if tempMap[e] == false {
 			tempMap[e] = true
 			result = append(result, e)
 		}
 	}
 	return result
-}
+}

src/jy/pretreated/division.go

@@ -58,7 +58,7 @@ var (
 	regStrWrap         = regexp.MustCompile("分包名称[：:]")
 	regBZJWarap        = regexp.MustCompile("保证金.*")
 	regPDFWarap        = regexp.MustCompile("[a-zA-Z](包|标段).(pdf|PDF)")
-	regAZWarap         = regexp.MustCompile("(标[a-zA-Z]取值|标段划分)")
+	regAZWarap         = regexp.MustCompile("(标[a-zA-Z]取值|标段划分|标液)")
 	replSerial         = regexp.MustCompile("(\r\n|^)([\\d一二三四五六七八九十][、．.:：，])+\\d")
 	moreColonReg       = regexp.MustCompile("[:：]+")
 	regFilter          = regexp.MustCompile("等$")
@@ -672,7 +672,7 @@ func divisionPackageChild(blockPackage *map[string]*util.BlockPackage, content,
 		if len(pkg) == 1 && strings.HasSuffix(con, v[0]) {
 			return false, ""
 		}
-		is := regexp.MustCompile(v[0] + "[:：]*").FindAllStringIndex(con, -1)
+		is := regexp.MustCompile(v[0]+"[:：]*").FindAllStringIndex(con, -1)
 		for _, sv := range is {
 			appendWarpIndex = append(appendWarpIndex, sv[0])
 		}
@@ -716,13 +716,13 @@ func divisionPackageChild(blockPackage *map[string]*util.BlockPackage, content,
 			indexPkgMap[sv[0]] = v[0]
 		}
 		//key在包前面，并且在一行的开头
-		keys := regexp.MustCompile("([\r\n]|^)([\u4e00-\u9fa5]{2,30}?([（(].{1,8}?[)）])?[:：\\s\u3000\u2003\u00a0]+.*?)" + pgflag).FindAllStringSubmatchIndex(con, -1)
+		keys := regexp.MustCompile("([\r\n]|^)([\u4e00-\u9fa5]{2,30}?([（(].{1,8}?[)）])?[:：\\s\u3000\u2003\u00a0]+.*?)"+pgflag).FindAllStringSubmatchIndex(con, -1)
 		if len(keys) == 0 {
 			//key在包前面，并且key以冒号结尾
-			keys = regexp.MustCompile("()([\u4e00-\u9fa5]{2,30}?([（(].{1,8}?[)）])?[:：]+[\\s\u3000\u2003\u00a0]*[\r\n])" + pgflag).FindAllStringSubmatchIndex(con, -1)
+			keys = regexp.MustCompile("()([\u4e00-\u9fa5]{2,30}?([（(].{1,8}?[)）])?[:：]+[\\s\u3000\u2003\u00a0]*[\r\n])"+pgflag).FindAllStringSubmatchIndex(con, -1)
 		}
 		if len(keys) == 0 {
-			keys = regexp.MustCompile("()注[:：]([\u4e00-\u9fa5]{2,8}?([（(].{1,8}?[)）])?[\\s\u3000\u2003\u00a0]*[\r\n])" + pgflag).FindAllStringSubmatchIndex(con, -1)
+			keys = regexp.MustCompile("()注[:：]([\u4e00-\u9fa5]{2,8}?([（(].{1,8}?[)）])?[\\s\u3000\u2003\u00a0]*[\r\n])"+pgflag).FindAllStringSubmatchIndex(con, -1)
 		}
 		for _, key := range keys {
 			startEndMap[key[5]] = key[4]
@@ -776,7 +776,7 @@ func divisionPackageChild(blockPackage *map[string]*util.BlockPackage, content,
 			}
 			index := util.PackageNumberConvert(bk)
 			//去掉前缀,空格必须要加，分kv的时候要用
-			text = regexp.MustCompile(bv[0] + "[:：]*").ReplaceAllString(text, "")
+			text = regexp.MustCompile(bv[0]+"[:：]*").ReplaceAllString(text, "")
 			if strings.TrimLeft(tmptext, bv[0]) == text || strings.TrimLeft(tmptext, bv[0]+":") == text {
 				var tagtitle string
 				for i, v := range titleindexs {