|
@@ -280,6 +280,11 @@ L:
|
|
|
if strings.Contains(v.title, info.title) || strings.Contains(info.title, v.title) {
|
|
|
reason = reason+"标题关键词且包含关系"
|
|
|
//继续二级金额判断
|
|
|
+ if !againRepeat(v,info){
|
|
|
+ b = true
|
|
|
+ source = v
|
|
|
+ break
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -406,10 +411,14 @@ L:
|
|
|
continue //无包含关系
|
|
|
}
|
|
|
if strings.Contains(v.title, info.title) || strings.Contains(info.title, v.title) {
|
|
|
- reason = "标题关键词且包含关系"
|
|
|
- b = true
|
|
|
- source = v
|
|
|
- break L
|
|
|
+ reason = reason+"标题关键词且包含关系"
|
|
|
+ //继续二级金额判断
|
|
|
+ if !againRepeat(v,info){
|
|
|
+ b = true
|
|
|
+ source = v
|
|
|
+ break
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -965,6 +974,32 @@ func contractRepeat_C(v *Info, info *Info) bool {
|
|
|
}
|
|
|
|
|
|
|
|
|
+func againRepeat(v *Info ,info *Info) bool {
|
|
|
+ //相同采购单位下
|
|
|
+ if info.buyer != "" &&v.buyer == info.buyer {
|
|
|
+ if info.subtype=="招标"||info.subtype=="邀标"||info.subtype=="询价"||
|
|
|
+ info.subtype=="竞谈"||info.subtype=="单一"||info.subtype=="竞价"||
|
|
|
+ info.subtype=="其他"||info.subtype=="变更" {
|
|
|
+ //预算金额满足条件
|
|
|
+ if v.budget!=info.budget&&v.budget!=0&&info.budget!=0 {
|
|
|
+ return true
|
|
|
+ }
|
|
|
+ }else if info.subtype=="中标"||info.subtype=="成交"||info.subtype=="废标"||
|
|
|
+ info.subtype=="流标"||info.subtype=="合同"||info.subtype=="验收"||
|
|
|
+ info.subtype=="违规"{
|
|
|
+ //中标金额单位满足条件
|
|
|
+ if (v.bidamount!=info.bidamount&&v.bidamount!=0&&info.bidamount!=0)||
|
|
|
+ (v.winner!=info.winner&&v.winner!=""&&info.winner!=""){
|
|
|
+ return true
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return false
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
|
|
|
|