|
@@ -249,14 +249,14 @@ func (p *ParticipateBid) CheckBidPower(projectId string, valid bool) (b bool) {
|
|
b = mysql.CheckParticipateManager(projectId, p.EntId, valid)
|
|
b = mysql.CheckParticipateManager(projectId, p.EntId, valid)
|
|
} else {
|
|
} else {
|
|
// 查参标人
|
|
// 查参标人
|
|
- b = mysql.CheckParticipateEntUser(projectId, p.PositionId, valid)
|
|
|
|
|
|
+ b = mysql.CheckParticipateEntUser(projectId, p.EntUserId, valid)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
// UpdateBidStatus 更新投标状态
|
|
// UpdateBidStatus 更新投标状态
|
|
-func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectId string) (flag bool) {
|
|
|
|
|
|
+func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectId string) error {
|
|
if p.PositionType == PositionTypeEnt {
|
|
if p.PositionType == PositionTypeEnt {
|
|
pLock := util.GetParticipateLock(fmt.Sprintf("%d_%s", p.EntId, projectId))
|
|
pLock := util.GetParticipateLock(fmt.Sprintf("%d_%s", p.EntId, projectId))
|
|
pLock.Lock()
|
|
pLock.Lock()
|
|
@@ -280,7 +280,7 @@ func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectI
|
|
// 新旧对比 处理成要保存的字段
|
|
// 新旧对比 处理成要保存的字段
|
|
recordContent, err := processRecordStr(oldMap, newMap)
|
|
recordContent, err := processRecordStr(oldMap, newMap)
|
|
if err != nil {
|
|
if err != nil {
|
|
- return false
|
|
|
|
|
|
+ return err
|
|
}
|
|
}
|
|
// 保存
|
|
// 保存
|
|
recordData := map[string]interface{}{
|
|
recordData := map[string]interface{}{
|
|
@@ -292,8 +292,10 @@ func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectI
|
|
"record_type": RecordTypeBidStatus,
|
|
"record_type": RecordTypeBidStatus,
|
|
"create_date": date.NowFormat(date.Date_Full_Layout),
|
|
"create_date": date.NowFormat(date.Date_Full_Layout),
|
|
}
|
|
}
|
|
- flag = mysql.InsertBidContent(recordData)
|
|
|
|
- return
|
|
|
|
|
|
+ if flag := mysql.InsertBidContent(recordData); !flag {
|
|
|
|
+ return fmt.Errorf("更新失败")
|
|
|
|
+ }
|
|
|
|
+ return nil
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|