|
|
@@ -24,13 +24,13 @@ type UpSearch struct {
|
|
|
SupplierName string
|
|
|
}
|
|
|
type UpInfoSearch struct {
|
|
|
- SupplierName string
|
|
|
- SupplierTypeCode string
|
|
|
- SupplierTypeName string
|
|
|
- AllUpNum int
|
|
|
- HeGeNum int
|
|
|
- UnHeGeNum int
|
|
|
- Reason string
|
|
|
+ SupplierName string
|
|
|
+ SupplierTypeCode string
|
|
|
+ SupplierTypeName string
|
|
|
+ AllUpNum int
|
|
|
+ HeGeNum int
|
|
|
+ UnHeGeNum int
|
|
|
+ Reason string
|
|
|
}
|
|
|
|
|
|
// @Title 获取所有
|
|
|
@@ -41,10 +41,12 @@ func (this *SelectController) GetTList() {
|
|
|
|
|
|
var model supplier.OilSupplierView
|
|
|
var model1 RegCapitalRange
|
|
|
+ var model2 supplier.OilSupplier
|
|
|
var jsonBlob = this.Ctx.Input.RequestBody
|
|
|
json.Unmarshal(jsonBlob, &model)
|
|
|
json.Unmarshal(jsonBlob, &model1)
|
|
|
- fmt.Println(model)
|
|
|
+ json.Unmarshal(jsonBlob, &model2)
|
|
|
+
|
|
|
// //获取分页信息
|
|
|
page := this.GetPageInfoForm()
|
|
|
where := " 1=1"
|
|
|
@@ -60,10 +62,6 @@ func (this *SelectController) GetTList() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if model.BusinessScope != "" {
|
|
|
- where = where + " and BusinessScope like '%" + model.BusinessScope + "%'"
|
|
|
- }
|
|
|
-
|
|
|
if model.AccessCardNo != "" {
|
|
|
where = where + " and AccessCardNo like '%" + model.AccessCardNo + "%'"
|
|
|
}
|
|
|
@@ -89,42 +87,44 @@ func (this *SelectController) GetTList() {
|
|
|
if model.CompanyType != "" {
|
|
|
where = where + " and CompanyType like '%" + model.CompanyType + "%'"
|
|
|
}
|
|
|
- Province := this.GetString("Province")
|
|
|
- if Province != "" {
|
|
|
- where = where + " and Province = '" + Province + "'"
|
|
|
+
|
|
|
+ if model2.BusinessScope != "" {
|
|
|
+ where = where + " and BusinessScope like '%" + model2.BusinessScope + "%'"
|
|
|
+ }
|
|
|
+ if model2.Province != "" {
|
|
|
+ where = where + " and Province = '" + model2.Province + "'"
|
|
|
}
|
|
|
- City := this.GetString("City")
|
|
|
- if City != "" {
|
|
|
- where = where + " and City = '" + City + "'"
|
|
|
+
|
|
|
+ if model2.City != "" {
|
|
|
+ where = where + " and City = '" + model2.City + "'"
|
|
|
}
|
|
|
- Street := this.GetString("Street")
|
|
|
- if Street != "" {
|
|
|
- where = where + " and Street = '" + Street + "'"
|
|
|
+
|
|
|
+ if model2.Street != "" {
|
|
|
+ where = where + " and Street = '" + model2.Street + "'"
|
|
|
}
|
|
|
- Address := this.GetString("Address")
|
|
|
- if Address != "" {
|
|
|
- where = where + " and Address like '%" + Address + "%'"
|
|
|
+
|
|
|
+ if model2.Address != "" {
|
|
|
+ where = where + " and Address like '%" + model2.Address + "%'"
|
|
|
}
|
|
|
|
|
|
- LinkProvince := this.GetString("LinkProvince")
|
|
|
- if LinkProvince != "" {
|
|
|
- where = where + " and LinkProvince = '" + LinkProvince + "'"
|
|
|
+ if model2.LinkProvince != "" {
|
|
|
+ where = where + " and LinkProvince = '" + model2.LinkProvince + "'"
|
|
|
}
|
|
|
- LinkCity := this.GetString("LinkCity")
|
|
|
- if LinkCity != "" {
|
|
|
- where = where + " and LinkCity = '" + LinkCity + "'"
|
|
|
+
|
|
|
+ if model2.LinkCity != "" {
|
|
|
+ where = where + " and LinkCity = '" + model2.LinkCity + "'"
|
|
|
}
|
|
|
- LinkStreet := this.GetString("LinkStreet")
|
|
|
- if LinkStreet != "" {
|
|
|
- where = where + " and LinkStreet = '" + LinkStreet + "'"
|
|
|
+
|
|
|
+ if model2.LinkStreet != "" {
|
|
|
+ where = where + " and LinkStreet = '" + model2.LinkStreet + "'"
|
|
|
}
|
|
|
- LinkAddress := this.GetString("LinkAddress")
|
|
|
- if LinkAddress != "" {
|
|
|
- where = where + " and LinkAddress like '%" + LinkAddress + "%'"
|
|
|
+
|
|
|
+ if model2.LinkAddress != "" {
|
|
|
+ where = where + " and LinkAddress like '%" + model2.LinkAddress + "%'"
|
|
|
}
|
|
|
- DepositBank := this.GetString("DepositBank")
|
|
|
- if DepositBank != "" {
|
|
|
- where = where + " and DepositBank like '%" + DepositBank + "%'"
|
|
|
+
|
|
|
+ if model2.DepositBank != "" {
|
|
|
+ where = where + " and DepositBank like '%" + model2.DepositBank + "%'"
|
|
|
}
|
|
|
SetupTime := this.GetString("SetupTime")
|
|
|
if SetupTime != "" {
|