bug

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/business/oilsupplier/badrecord/badrecord.go

@@ -5,22 +5,29 @@ import (
 )
 
 type BadRecord struct {
-	Id             int       `xorm:"not null pk autoincr comment('主键编号') INT(10)"`
-	Companyname    string    `xorm:"not null comment('企业名称') VARCHAR(70)"`
-	Companycode    string    `xorm:"not null comment('企业ID号') VARCHAR(10)"`
-	Categoryname   string    `xorm:"not null comment('准入类别名称') VARCHAR(20)"`
-	Categorycode   string    `xorm:"not null comment('准入类别编码') VARCHAR(10)"`
+	Id             int       `xorm:"not null pk autoincr INT(11)"`
+	Companyname    string    `xorm:"VARCHAR(70)"`
+	Companycode    string    `xorm:"comment('ID') VARCHAR(10)"`
+	Categoryname   string    `xorm:"VARCHAR(20)"`
+	Categorycode   string    `xorm:"VARCHAR(10)"`
 	Record         string    `xorm:"not null comment('不良记录') VARCHAR(500)"`
 	Bak1           string    `xorm:"comment('备用字段1') VARCHAR(50)"`
 	Bak2           string    `xorm:"comment('备用字段2') VARCHAR(50)"`
 	Bak3           string    `xorm:"comment('备用字段3') VARCHAR(50)"`
 	Bak4           string    `xorm:"comment('备用字段4') VARCHAR(50)"`
+	Wzstatus       string    `xorm:"comment('物资状态') VARCHAR(10)"`
+	Wzrecord       string    `xorm:"comment('物资不良记录') VARCHAR(500)"`
+	Jjstatus       string    `xorm:"comment('基建状态') VARCHAR(10)"`
+	Jjrecord       string    `xorm:"comment('基建不良记录') VARCHAR(500)"`
+	Jfstatus       string    `xorm:"comment('技术服务状态') VARCHAR(10)"`
+	Jfrecord       string    `xorm:"comment('技术服务不良记录') VARCHAR(500)"`
+	Certrecord     string    `xorm:"comment('准入范围不良记录') VARCHAR(500)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
-	Isdelete       int       `xorm:"default 0 comment('是否以删除（0正常，1已删除）') INT(10)"`
+	Isdelete       int       `xorm:"default 0 comment('是否以删除（0正常，1已删除）') INT(11)"`
 	Createon       time.Time `xorm:"comment('创建时间') DATETIME"`
-	Createuserid   int       `xorm:"comment('创建者编号 ') INT(10)"`
+	Createuserid   int       `xorm:"comment('创建者编号') INT(11)"`
 	Createby       string    `xorm:"comment('创建者') VARCHAR(50)"`
 	Modifiedon     time.Time `xorm:"comment('修改时间') DATETIME"`
-	Modifieduserid int       `xorm:"comment('修改者编号') INT(10)"`
+	Modifieduserid int       `xorm:"comment('修改者编号') INT(11)"`
 	Modifiedby     string    `xorm:"comment('修改者') VARCHAR(50)"`
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/badrecord.go

@@ -107,92 +107,148 @@ func (this *BadRecordController) AddBadRecord() {
 	svc := BadRecord.GetBadRecordService(utils.DBE)
 	json.Unmarshal(jsonBlob, &model)
 
-	isFlag:=this.GetString("_isFlag")
-	goodsString:=this.GetString("_goodsString")
-	basisString:=this.GetString("_basisString")
-	tcString:=this.GetString("_tcString")
-
 	//判断名称是否已拥有
 	var companyCode = model.Companycode
-	//var categoryCode = model.Categorycode
 
-	where := "1=1 and CompanyCode='" + companyCode + "' and Bak1='0'"
+	where := "1=1 and CompanyCode='" + companyCode + "'"
 	total := svc.GetName(BaseBadRecord, where)
 	if total != 0 {
-		errinfo.Message = "已有重复数据"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-	} else {
-		var result []map[string]string
-		sql := "select SupplierName from " + OilSupplierName + " where id =" + model.Companycode + ""
-		result, _ = svc.DBE.QueryString(sql)
 
-		model.Companyname = result[0]["SupplierName"]
+		model.Modifiedon = time.Now()
+		model.Modifiedby = this.User.Realname
+		model.Modifieduserid,_ = strconv.Atoi(this.User.Id)
+		cols := []string{"WZStatus","WZRecord","JJStatus","JJRecord","JFStatus","JFRecord","CertRecord","ModifiedOn","ModifiedUserId","ModifiedBy"}
+		err:= svc.UpdateEntityBywheretbl(BaseBadRecord,&model,cols,"CompanyCode='"+companyCode+"'")
+
+		//更新准入表状态
+		if model.Wzstatus!=""{
+			var supplierCert suppliercert.OilSupplierCert
+			supplierCert.InFlag=model.Wzstatus
+			cols := []string{ "InFlag"}
+			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+		}
+		if model.Jjstatus!=""{
+			var supplierCert suppliercert.OilSupplierCert
+			supplierCert.InFlag=model.Jjstatus
+			cols := []string{ "InFlag"}
+			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+		}
+		if model.Jfstatus!=""{
+			var supplierCert suppliercert.OilSupplierCert
+			supplierCert.InFlag=model.Jfstatus
+			cols := []string{ "InFlag"}
+			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+		}
+
+		if err == nil {
+			errinfo.Message = "更新成功"
+			errinfo.Code = 1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "更新失败"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		}
+	} else {
 		model.Createon = time.Now()
 		model.Createby = this.User.Realname
 		model.Createuserid, _ = utils.StrTo(this.User.Id).Int()
-		if isFlag=="0"{
-			model.Bak1 = "0"
-			_, err := svc.InsertEntityBytbl(BaseBadRecord, &model)
 
-			//更新准入表状态
+		_, err := svc.InsertEntityBytbl(BaseBadRecord, &model)
+
+		//更新准入表状态
+		if model.Wzstatus!=""{
 			var supplierCert suppliercert.OilSupplierCert
-			supplierCert.InFlag=model.Bak3
+			supplierCert.InFlag=model.Wzstatus
 			cols := []string{ "InFlag"}
-			svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"'")
-
-			if err == nil {
-				//新增
-				errinfo.Message = "添加成功！"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			}
-		}else {
-			model.Bak1 = "1"
-			_, err := svc.InsertEntityBytbl(BaseBadRecord, &model)
-			//更新准入范围的表状态
-			if goodsString!=""{
-				var supplierCertSub suppliercertsub.OilSupplierCertSub
-				supplierCertSub.CertSubStatus=model.Bak3
-				cols := []string{ "CertSubStatus"}
-				svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01' and Id in ("+goodsString+")")
-			}
-
-			if basisString!=""{
-				var supplierCertSub suppliercertsub.OilSupplierCertSub
-				supplierCertSub.CertSubStatus=model.Bak3
-				cols := []string{ "CertSubStatus"}
-				svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02' and Id in ("+basisString+")")
-			}
-
-			if tcString!=""{
-				var supplierCertSub suppliercertsub.OilSupplierCertSub
-				supplierCertSub.CertSubStatus=model.Bak3
-				cols := []string{ "CertSubStatus"}
-				svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03' and Id in ("+tcString+")")
-			}
-			if err == nil {
-				//新增
-				errinfo.Message = "添加成功！"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			}
+			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+		}
+		if model.Jjstatus!=""{
+			var supplierCert suppliercert.OilSupplierCert
+			supplierCert.InFlag=model.Jjstatus
+			cols := []string{ "InFlag"}
+			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+		}
+		if model.Jfstatus!=""{
+			var supplierCert suppliercert.OilSupplierCert
+			supplierCert.InFlag=model.Jfstatus
+			cols := []string{ "InFlag"}
+			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+		}
+		if err == nil {
+			errinfo.Message = "保存成功"
+			errinfo.Code = 2
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "保存失败"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
 		}
+
+
 	}
 
+
+	//	if isFlag=="0"{
+	//		model.Bak1 = "0"
+
+	//
+	//
+	//		if err == nil {
+	//			//新增
+	//			errinfo.Message = "添加成功！"
+	//			errinfo.Code = 0
+	//			this.Data["json"] = &errinfo
+	//			this.ServeJSON()
+	//		} else {
+	//			errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+	//			errinfo.Code = -1
+	//			this.Data["json"] = &errinfo
+	//			this.ServeJSON()
+	//		}
+	//	}else {
+	//		model.Bak1 = "1"
+	//		_, err := svc.InsertEntityBytbl(BaseBadRecord, &model)
+	//		//更新准入范围的表状态
+	//		if goodsString!=""{
+	//			var supplierCertSub suppliercertsub.OilSupplierCertSub
+	//			supplierCertSub.CertSubStatus=model.Bak3
+	//			cols := []string{ "CertSubStatus"}
+	//			svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01' and Id in ("+goodsString+")")
+	//		}
+	//
+	//		if basisString!=""{
+	//			var supplierCertSub suppliercertsub.OilSupplierCertSub
+	//			supplierCertSub.CertSubStatus=model.Bak3
+	//			cols := []string{ "CertSubStatus"}
+	//			svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02' and Id in ("+basisString+")")
+	//		}
+	//
+	//		if tcString!=""{
+	//			var supplierCertSub suppliercertsub.OilSupplierCertSub
+	//			supplierCertSub.CertSubStatus=model.Bak3
+	//			cols := []string{ "CertSubStatus"}
+	//			svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03' and Id in ("+tcString+")")
+	//		}
+	//		if err == nil {
+	//			//新增
+	//			errinfo.Message = "添加成功！"
+	//			errinfo.Code = 0
+	//			this.Data["json"] = &errinfo
+	//			this.ServeJSON()
+	//		} else {
+	//			errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+	//			errinfo.Code = -1
+	//			this.Data["json"] = &errinfo
+	//			this.ServeJSON()
+	//		}
+	//	}
+	//}
+
 }
 
 // @Title 删除单条信息
@@ -215,25 +271,17 @@ func (this *BadRecordController) DeleteBadRecordById() {
 	var temp BadRecord.BadRecord
 	svc.GetEntity(&temp,"Id='"+id+"'")
 
-	if temp.Bak1=="0"{
-		var supplierCert suppliercert.OilSupplierCert
-		supplierCert.InFlag="1"
-		cols1:= []string{ "InFlag"}
-		svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols1,"SupplierId='"+temp.Companycode+"'")
-	}else if temp.Bak1=="1"{
-		var temp1 BadRecord.BadRecord
-		count,_:=svc.GetCount(&temp1,"CompanyCode='"+temp.Companycode+"' and Bak1='1'")
-		if count==1{
-			var supplierCertSub suppliercertsub.OilSupplierCertSub
-			supplierCertSub.CertSubStatus="1"
-			cols := []string{ "CertSubStatus"}
-			svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+temp.Companycode+"' and CertSubStatus='2'")
-		}else {
 
-		}
+	var supplierCert suppliercert.OilSupplierCert
+	supplierCert.InFlag="1"
+	cols1:= []string{ "InFlag"}
+	svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols1,"SupplierId='"+temp.Companycode+"'")
 
-	}
 
+	var supplierCertSub suppliercertsub.OilSupplierCertSub
+	supplierCertSub.CertSubStatus="1"
+	cols := []string{ "CertSubStatus"}
+	svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+temp.Companycode+"")
 
 	err := svc.DeleteById(BaseBadRecord, id)
 	if err == nil {
@@ -403,17 +451,11 @@ func (this *BadRecordController) SerachGoodsCertByCompany() {
 	currentPage := this.GetString("_currentPage")
 	size := this.GetString("_size")
 	certName := this.GetString("_certName")
-	Bak1 := this.GetString("_Bak1")
 
 	sqlAdd:=""
 	if certName!=""{
 		sqlAdd=sqlAdd+"and Name like '%"+certName+"%'"
 	}
-	if Bak1!=""{
-		sqlAdd=sqlAdd+"and CertSubStatus = '2'"
-	}else{
-		sqlAdd=sqlAdd+"and CertSubStatus = '1'"
-	}
 	sizeIntPage,_:=strconv.Atoi(size)
 	currentIntPage,_:=strconv.Atoi(currentPage)
 	ye:=strconv.Itoa((currentIntPage-1)*sizeIntPage)
@@ -444,17 +486,11 @@ func (this *BadRecordController) SerachBasisCertByCompany() {
 	currentPage := this.GetString("_currentPage")
 	size := this.GetString("_size")
 	certName := this.GetString("_certName")
-	Bak1 := this.GetString("_Bak1")
 	sqlAdd:=""
 	if certName!=""{
 		sqlAdd="and Name like '%"+certName+"%'"
 	}
 
-	if Bak1!=""{
-		sqlAdd=sqlAdd+"and CertSubStatus = '2'"
-	}else{
-		sqlAdd=sqlAdd+"and CertSubStatus = '1'"
-	}
 	sizeIntPage,_:=strconv.Atoi(size)
 	currentIntPage,_:=strconv.Atoi(currentPage)
 	ye:=strconv.Itoa((currentIntPage-1)*sizeIntPage)
@@ -484,17 +520,11 @@ func (this *BadRecordController) SerachTCCertByCompany() {
 	currentPage := this.GetString("_currentPage")
 	size := this.GetString("_size")
 	certName := this.GetString("_certName")
-	Bak1 := this.GetString("_Bak1")
+
 	sqlAdd:=""
 	if certName!=""{
 		sqlAdd="and Name like '%"+certName+"%'"
 	}
-
-	if Bak1!=""{
-		sqlAdd=sqlAdd+"and CertSubStatus = '2'"
-	}else{
-		sqlAdd=sqlAdd+"and CertSubStatus = '1'"
-	}
 	sizeIntPage,_:=strconv.Atoi(size)
 	currentIntPage,_:=strconv.Atoi(currentPage)
 	ye:=strconv.Itoa((currentIntPage-1)*sizeIntPage)
@@ -514,4 +544,55 @@ func (this *BadRecordController) SerachTCCertByCompany() {
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 
+}
+
+// @Title
+// @Description
+// @Success 200 {object}
+// @router /serachcerttype [get]
+func (this *BadRecordController) SerachCertType() {
+	companyId := this.GetString("id")
+	var wzFlag bool =false
+	var jjFlag bool =false
+	var jfFlag bool =false
+	svc := BadRecord.GetBadRecordService(utils.DBE) //获得数据库引擎
+	var wzSupplierCert suppliercert.OilSupplierCert
+	wzcount,_:=svc.GetCount(&wzSupplierCert,"SupplierId='"+companyId+"' and SupplierTypeCode='01'")
+	if wzcount>0{
+		wzFlag=true
+	}
+	var jjSupplierCert suppliercert.OilSupplierCert
+	jjcount,_:=svc.GetCount(&jjSupplierCert,"SupplierId='"+companyId+"' and SupplierTypeCode='02'")
+	if jjcount>0{
+		jjFlag=true
+	}
+	var jfSupplierCert suppliercert.OilSupplierCert
+	jfcount,_:=svc.GetCount(&jfSupplierCert,"SupplierId='"+companyId+"' and SupplierTypeCode='03'")
+	if jfcount>0{
+		jfFlag=true
+	}
+
+	var list =[3]bool{wzFlag,jjFlag,jfFlag}
+	var datainfo DataInfo
+	datainfo.Items =list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}
+
+// @Title
+// @Description
+// @Success 200 {object}
+// @router /backcompanybadrecord [get]
+func (this *BadRecordController) BackCompanyBadRecord() {
+	companyId := this.GetString("id")
+	svc := BadRecord.GetBadRecordService(utils.DBE) //获得数据库引擎
+	var model BadRecord.BadRecord
+	svc.GetEntity(&model,"Companycode='"+companyId+"'")
+
+	var datainfo DataInfo
+	datainfo.Items =model
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertsub.go

@@ -836,7 +836,7 @@ func (this *OilSupplierCertSubController) UpdateStatus() {
 	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
 	var error error
 	if Status =="1"{
-		_,error=svc.DBE.Exec("update "+ OilSupplierCertSubName+" set CertSubStatus='3' where Id="+Id+"")
+		_,error=svc.DBE.Exec("update "+ OilSupplierCertSubName+" set CertSubStatus='2' where Id="+Id+"")
 	}else{
 		_,error=svc.DBE.Exec("update "+ OilSupplierCertSubName+" set CertSubStatus='1' where Id="+Id+"")
 	}

src/dashoo.cn/frontend_web/src/api/oilsupplier/oilclassorgset.js

@@ -80,12 +80,11 @@ export default {
       params: params
     })
   },
-  addBadRecord (formData, params, myAxios) {
+  addBadRecord (formData, myAxios) {
     return myAxios({
       url: '/badrecord/add',
       method: 'post',
-      data: formData,
-      params: params
+      data: formData
     })
   },
   deletebadrecordbyid (id, myAxios) {
@@ -128,5 +127,17 @@ export default {
       method: 'get',
       params: params
     })
+  },
+  serachCertType (id, myAxios) {
+    return myAxios({
+      url: '/badrecord/serachcerttype?id=' + id,
+      method: 'get'
+    })
+  },
+  backCompanyBadRecord (id, myAxios) {
+    return myAxios({
+      url: '/badrecord/backcompanybadrecord?id=' + id,
+      method: 'get'
+    })
   }
 }