'sdf'

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -754,6 +754,8 @@ func structToMapDemo(obj interface{}) map[string]interface{} {
 // @Success	200	{object} controllers.Request
 // @router /add [post]
 func (this *OilContractController) AddEntity() {
+	var errinfo ErrorDataInfo
+
 	var model contract.OilContract
 	var jsonBlob = this.Ctx.Input.RequestBody
 	svc := contract.GetOilContractService(utils.DBE)
@@ -763,9 +765,19 @@ func (this *OilContractController) AddEntity() {
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 
+	var contract contract.OilContract
+	tempCount,_:=svc.GetCount(&contract,"ContractNo='" + model.ContractNo +"' ")
+	if tempCount > 0 {
+		errinfo.Message = "合同编号已存在！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 	_, err := svc.InsertEntityBytbl(OilContractName, &model)
 
-	var errinfo ErrorDataInfo
+
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"
@@ -924,6 +936,17 @@ func (this *OilContractController) UpdateEntity() {
 
 		"PoNumber",
 	}
+
+	var contract contract.OilContract
+	tempCount,_:=svc.GetCount(&contract,"ContractNo='" + model.ContractNo +"' and id <> " + id)
+	if tempCount > 0 {
+		errinfo.Message = "合同编号已存在！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 	err := svc.UpdateEntityBytbl(OilContractName, id, &model, cols)
 	if err == nil {
 		errinfo.Message = "修改成功！"
@@ -957,9 +980,10 @@ func (this *OilContractController) DeleteEntity() {
 	// 有没有待审核的评价
 	itemsSvc := contractReview.GetOilContractReviewService(utils.DBE)
 	var review contractReview.OilContractReview
-	tempCount,_:=itemsSvc.GetCount(&review,"ContractId='" + Id +"' and status > 0 and status < 8 ")
+	//tempCount,_:=itemsSvc.GetCount(&review,"ContractId='" + Id +"' and status > 0 and status < 8 ")
+	tempCount,_:=itemsSvc.GetCount(&review,"ContractId='" + Id +"' ")
 	if tempCount > 0 {
-		errinfo.Message = "该合同存在待审核评价！"
+		errinfo.Message = "该合同存在评价不能删除！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()