Merge branch 'dev3.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.2

src/jy/pretreated/analystep.go

@@ -102,15 +102,6 @@ func AnalyStart(job *util.Job) {
 		bl.SpaceKV = SspacekvEntity.Entrance(newCon, "", nil)
 		job.Block = append(job.Block, bl)
 	}
-	for _, v := range job.BlockPackage {
-		block := &util.Block{}
-		block.ColonKV = v.ColonKV
-		block.TableKV = v.TableKV
-		block.SpaceKV = v.SpaceKV
-		block.Text = v.Text
-		block.Winnerorder = v.WinnerOrder
-		job.Block = append(job.Block, block)
-	}
 }
 
 //匹配项目编号

src/jy/pretreated/analytable.go

@@ -2103,7 +2103,7 @@ func (tn *Table) manyPackageProcessByIndex(index []string, standIndex_pos []int)
 		} else if val, bvs := v1.(string); bvs && len(index) == 1 {
 			//删除子包的kv
 			k1tags, _, _, _, _, _ := CommonDataAnaly(k1, "", "", val)
-			if len(k1tags) > 0 && regexp.MustCompile("^(项目|开标|采购单位|招标机构)").MatchString(k1tags[0]) { //(k1tags[0].Value == "采购单位" || k1tags[0].Value == "项目编号")) {
+			if !(len(k1tags) > 0 && regexp.MustCompile("^(项目|开标|采购单位|招标机构)").MatchString(k1tags[0]))  {
 				//log.Println("remove", k1, val)
 				tn.SortKV.RemoveKey(k1)
 				tn.assemblePackage(k1, val, index[0])