|
@@ -188,8 +188,8 @@ func (this *QualChangeController) FileList() {
|
|
|
var list []qualchange.OilQualChangeDetail
|
|
var list []qualchange.OilQualChangeDetail
|
|
|
svc := qualchange.GetQualChangeService(utils.DBE)
|
|
svc := qualchange.GetQualChangeService(utils.DBE)
|
|
|
where := " 1=1"
|
|
where := " 1=1"
|
|
|
- orderby := "a.Id"
|
|
|
|
|
- asc := false
|
|
|
|
|
|
|
+ orderby := "a.SupplierTypeCode"
|
|
|
|
|
+ asc := true
|
|
|
Order := this.GetString("Order")
|
|
Order := this.GetString("Order")
|
|
|
Prop := this.GetString("Prop")
|
|
Prop := this.GetString("Prop")
|
|
|
if Order != "" && Prop != "" {
|
|
if Order != "" && Prop != "" {
|
|
@@ -198,13 +198,13 @@ func (this *QualChangeController) FileList() {
|
|
|
asc = true
|
|
asc = true
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- //SupplierId := this.GetString("SupplierId")
|
|
|
|
|
- //if SupplierId != "" {
|
|
|
|
|
- // where = where + " and a.SupplierId = '" + SupplierId + "'"
|
|
|
|
|
- //}
|
|
|
|
|
|
|
+ SupplierId := this.GetString("SupplierId")
|
|
|
|
|
+ if SupplierId != "" {
|
|
|
|
|
+ where = where + " and a.SupplierId = '" + SupplierId + "'"
|
|
|
|
|
+ }
|
|
|
SupplierTypeCode := this.GetString("SupplierTypeCode")
|
|
SupplierTypeCode := this.GetString("SupplierTypeCode")
|
|
|
if SupplierTypeCode != "" {
|
|
if SupplierTypeCode != "" {
|
|
|
- where = where + " and a.SupplierTypeCode = '000', '01','02','03'"
|
|
|
|
|
|
|
+ where = where + " and a.SupplierTypeCode in ( '000', " + SupplierTypeCode + ")"
|
|
|
}
|
|
}
|
|
|
total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where)
|
|
total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where)
|
|
|
var datainfo DataInfo
|
|
var datainfo DataInfo
|