完善了供应商分页接口的逻辑

controllers/supply_order_api_contorller.go

@@ -73,17 +73,80 @@ func SupplyOrderApiRegistRouters() {
 
 //获取供应商列表GetSupplyList
 func (this *SupplyOrderApiController) GetSupplyList() {
-	ctype, _ := this.GetInt64("ctype")
-	page, _ := this.GetInt64("page")
-	limit, _ := this.GetInt64("limit")
-	code := this.GetString("code")
-	sname := this.GetString("sname")
-	cname := this.GetString("cname")
-	//var tmp map[interface{}]interface{}
+	ctype, _ := this.GetInt64("ctype") //供应商类别
+	page, _ := this.GetInt64("page")   //页码
+	limit, _ := this.GetInt64("limit") //
+	code := this.GetString("code")     //供应商编号
+	sname := this.GetString("sname")   //供应商名称
+	cname := this.GetString("cname")   //联系人名子
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取分页的数据
 	list, total, err := service.GetSupplyList(ctype, page, limit, code, sname, cname)
+	//获取供应商类别
+	costClassify := "供应商类别"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	tmpmap := make(map[int64]string)   //储存供应商类别
+	namemap := make(map[string]string) //储存首要联系人
+	for i := 0; i < len(drugTypeList); i++ {
+		k := int64(drugTypeList[i].Value)
+		v := drugTypeList[i].Name
+		tmpmap[k] = v
+	}
 	if err == nil {
+		for i := 0; i < len(list); i++ {
+			code := list[i].SupplierCode
+			fistname, errs := service.FindName(code)
+			if errs != nil && errs.Error() != "record not found" {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+			namemap[code] = fistname.Name
+		}
+		type SpSupplierNameList struct { //基于SpSupplierName结构体修改的，为了方便前端取数据整合了一下，删除了几个用不到的字段，添加了联系人名字和供应商类别两个字段
+			ID           int64
+			SupplierCode string
+			SupplierName string
+			SupplierType int64
+			VatRate      float64
+			Number       string
+			Bank         string
+			BankAccount  string
+			UserOrgId    int64
+			Status       int64
+			ContactsId   int64
+			ConName      string //供应商主要联系人名字
+			TypeName     string //供应商类别
+		}
+		//初始化该结构体
+		tmplist := []*SpSupplierNameList{}
+		for i := 0; i < len(list); i++ {
+			var typename string //类别名称
+			if list[i].SupplierType == 0 {
+				typename = ""
+			} else {
+				typename = tmpmap[list[i].SupplierType]
+			}
+			tlist := &SpSupplierNameList{
+				list[i].ID,
+				list[i].SupplierCode,
+				list[i].SupplierName,
+				list[i].SupplierType,
+				list[i].VatRate,
+				list[i].Number,
+				list[i].Bank,
+				list[i].BankAccount,
+				list[i].UserOrgId,
+				list[i].Status,
+				list[i].ContactsId,
+				namemap[list[i].SupplierCode],
+				typename,
+			}
+			tmplist = append(tmplist, tlist)
+
+		}
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":  list,
+			"list":  tmplist,
 			"total": total,
 		})
 	} else {

service/supply_service.go

@@ -7,16 +7,22 @@ import (
 	"time"
 )
 
+//根据供应商编号获取首要联系人
+func FindName(code string) (fistname models.SpSupplierContacts, err error) {
+	err = XTReadDB().Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and status = 1", code).First(&fistname).Error
+	return fistname, err
+}
+
 //供应商分页
 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")
+	db := XTReadDB().Model(&supplylist).Where("sgj_xt.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.id = sgj_xt.xt_supplier_name.contacts_id")
-		db = db.Where("sgj_xt.xt_supplier_contacts.name like ? ", cname).Group("sgj_xt.xt_supplier_name.id")
+		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 ctype > 0 {
 		db = db.Where("sgj_xt.xt_supplier_name.supplier_type = ?", ctype)