|
|
@@ -925,7 +925,7 @@ func (this *OilSupplierController) JzpsListExport() {
|
|
|
var list1 []supplier.OilSupplierExport
|
|
|
if SupplierTypeName == "物资类" {
|
|
|
svc.GetMyPagingEntitiesWithOrderBytblExportNew(OilSupplierName, OilSupplierCertName, &list1, where1)
|
|
|
- } else if SupplierTypeName == "服务类" || SupplierTypeName == "基建类"{
|
|
|
+ } else if SupplierTypeName == "服务类" || SupplierTypeName == "基建类" {
|
|
|
where = where + " and b.SupplierTypeName like '%" + SupplierTypeName + "%'"
|
|
|
svc.GetMyPagingEntitiesWithOrderBytblExport(OilSupplierName, OilSupplierCertName, &list, where)
|
|
|
} else {
|
|
|
@@ -1029,7 +1029,7 @@ func (this *OilSupplierController) GetJoinStoreEntityList() {
|
|
|
//获取分页信息
|
|
|
page := this.GetPageInfoForm()
|
|
|
where := " 1=1 "
|
|
|
- orderby := "Id"
|
|
|
+ orderby := "AccessCardNo"
|
|
|
asc := false
|
|
|
Order := this.GetString("Order")
|
|
|
Prop := this.GetString("Prop")
|
|
|
@@ -1386,7 +1386,7 @@ func (this *OilSupplierController) ExportStoreList() {
|
|
|
inStyle = "取消"
|
|
|
}
|
|
|
dataString := strconv.Itoa(idx+1) + "," + inStyle + "," + item.AccessCardNo + "," + item.SupplierTypeName + "," + item.SupplierName + "," +
|
|
|
- utils.ToStr(item.ApplyTime.Format("2006-01-02")) + "," + item.CommercialNo + "," + item.AllAddress + "," + item.Address + "," + regCapital + "," + item.Currency + "," + item.ContactName + "," + item.CompanyType + "," + utils.ToStr(item.SetupTime.Format("2006-01-02")) + "," + item.DepositBank + "," + item.BankAccount + "," + item.EMail + "," + item.BankCreditRating + "," + item.Mobile + "," + item.Telphone + "," + item.Fax + "," + item.CompanyTel + "," + item.Remark
|
|
|
+ utils.ToStr(item.ApplyTime.Format("2006-01-02")) + "," + item.CommercialNo + "," + item.AllAddress + "," + item.Address + "," + regCapital + "," + item.Currency + "," + item.ContactName + "," + item.CompanyType + "," + utils.ToStr(item.SetupTime.Format("2006-01-02")) + "," + item.DepositBank + "," + item.BankAccount + "," + item.EMail + "," + item.BankCreditRating + "," + item.Mobile + "," + item.Telphone + "," + item.Fax + "," + item.CompanyTel + "," + item.Remark
|
|
|
cellName := strings.Split(dataString, ",")
|
|
|
row := sheet.AddRow()
|
|
|
row.WriteSlice(&cellName, -1)
|
wd