供应商

controllers/supply_order_api_contorller.go

@@ -99,12 +99,13 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "page或limit参数不能为空")
 		return
 	}
-	code := this.GetString("code")   //供应商编号
-	sname := this.GetString("sname") //供应商名称
-	cname := this.GetString("cname") //联系人名字
+	//code := this.GetString("code")   //供应商编号
+	//sname := this.GetString("sname") //供应商名称
+	//cname := this.GetString("cname") //联系人名字
+	keyword := this.GetString("keyword") //供应商编号\供应商名称\联系人名字
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//获取分页的数据
-	list, total, err := service.GetSupplyList(ctype, page, limit, code, sname, cname)
+	list, total, err := service.GetSupplyList(ctype, page, limit, keyword)
 	//获取供应商类别
 	costClassify := "供应商类别"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
@@ -235,13 +236,13 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	}
 	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
 	if dataBody["suppliertype"] == "" || dataBody["suppliertype"] == 0 {
-		var tmp int64 = 0
+		var tmp float64 = 0
 		dataBody["suppliertype"] = tmp
 	}
 	if dataBody["vatrate"] == "" {
 		dataBody["vatrate"] = 0
 	}
-	supplierType := dataBody["suppliertype"].(int64) //供应商类别
+	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
 	//vatRate, _ := this.GetFloat("vatrate")           //增值税税率
 	vatRate, _ := dataBody["suppliertype"].(float64) //增值税税率
 	//number := this.GetString("number")               //纳税人识别号

service/supply_service.go

@@ -13,26 +13,18 @@ func FindName(code string) (fistname models.SpSupplierContacts, err error) {
 }
 
 //供应商分页
-func GetSupplyList(ctype int64, page int64, limit int64, code string, sname string, cname string) (supplylist []*models.SpSupplierName, total int64, err error) {
-	db := XTReadDB().Model(&supplylist).Where("sgj_xt.xt_supplier_name.status = 1 ")
+func GetSupplyList(ctype int64, page int64, limit int64, keyword string) (supplylist []*models.SpSupplierName, total int64, err error) {
+	db := XTReadDB().Model(&supplylist).Where("xt_supplier_name.status = 1 ")
 
 	offset := (page - 1) * limit
 
-	if cname != "" {
-		cname = "%" + cname + "%" //联系人
-		db = db.Joins("join sgj_xt.xt_supplier_contacts on sgj_xt.xt_supplier_contacts.supplier_code = sgj_xt.xt_supplier_name.supplier_code")
-		db = db.Where("sgj_xt.xt_supplier_contacts.name like ? and sgj_xt.xt_supplier_contacts.status = 1 ", cname).Group("sgj_xt.xt_supplier_name.id")
+	if len(keyword) > 0 {
+		keyword = "%" + keyword + "%" //联系人
+		db = db.Joins("join xt_supplier_contacts on xt_supplier_contacts.supplier_code = xt_supplier_name.supplier_code")
+		db = db.Where("xt_supplier_contacts.name like ? or xt_supplier_name.supplier_code like ? or xt_supplier_name.supplier_name like ? ", keyword, keyword, keyword).Group("xt_supplier_name.id")
 	}
 	if ctype > 0 {
-		db = db.Where("sgj_xt.xt_supplier_name.supplier_type = ?", ctype)
-	}
-	if code != "" {
-		code = "%" + code + "%" //供应商编码
-		db = db.Where("sgj_xt.xt_supplier_name.supplier_code = ?", code)
-	}
-	if sname != "" {
-		sname = "%" + sname + "%" //供应商名称
-		db = db.Where("sgj_xt.xt_supplier_name.supplier_name = ?", sname)
+		db = db.Where("xt_supplier_name.supplier_type = ?", ctype)
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Find(&supplylist).Error
 	return supplylist, total, err