|
@@ -360,28 +360,22 @@ func (d *ContractDao) Unlock(projectId int, bidsectionId int, treeId int, id int
|
|
|
// 1.解锁合同
|
|
|
contractsCm := models.CmContracts{}
|
|
|
contractsCm.Locking = 0
|
|
|
- successNum, err := session.Where("id = ? and project_id = ? and bidsection_id = ? ", id, projectId, bidsectionId).Cols("locking").Update(contractsCm)
|
|
|
+ contractsCm.Status = 1
|
|
|
+ _, err = session.Where("id = ? and project_id = ? and bidsection_id = ? ", id, projectId, bidsectionId).Cols("locking,Status").Update(contractsCm)
|
|
|
if err != nil {
|
|
|
session.Rollback()
|
|
|
return errors.New("解锁合同出错")
|
|
|
}
|
|
|
- if successNum == 0 {
|
|
|
- session.Rollback()
|
|
|
- return errors.New("解锁合同异常")
|
|
|
- }
|
|
|
|
|
|
// 2.更新项目节上合同锁状态
|
|
|
treeContractsCm := models.CmTreeContracts{}
|
|
|
treeContractsCm.ContractLocking = 0
|
|
|
- successNum, err = session.Where("tree_id = ? and project_id = ? and bidsection_id = ? ", treeId, projectId, bidsectionId).Cols("contract_locking").Update(treeContractsCm)
|
|
|
+ treeContractsCm.ContractStatus = 1
|
|
|
+ _, err = session.Where("tree_id = ? and project_id = ? and bidsection_id = ? ", treeId, projectId, bidsectionId).Cols("contract_locking,contract_status").Update(treeContractsCm)
|
|
|
if err != nil {
|
|
|
session.Rollback()
|
|
|
return errors.New("解锁合同出错-项目节")
|
|
|
}
|
|
|
- if successNum == 0 {
|
|
|
- session.Rollback()
|
|
|
- return errors.New("解锁合同异常-项目节")
|
|
|
- }
|
|
|
|
|
|
err = session.Commit()
|
|
|
if err != nil {
|