|
|
|
@@ -128,7 +128,7 @@ public class WxShopController extends BaseController { |
|
|
|
wxShop = new WxShop(); |
|
|
|
} |
|
|
|
wxShop.setTenantId(getTenantId()); |
|
|
|
wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); |
|
|
|
wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); |
|
|
|
final PageInfo<Map<String, Object>> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
@@ -142,7 +142,7 @@ public class WxShopController extends BaseController { |
|
|
|
wxShop = new WxShop(); |
|
|
|
} |
|
|
|
wxShop.setTenantId(getTenantId()); |
|
|
|
wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); |
|
|
|
wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); |
|
|
|
wxShopService.exportShop(wxShop, request, response); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -155,7 +155,7 @@ public class WxShopController extends BaseController { |
|
|
|
wxShop = new WxShop(); |
|
|
|
} |
|
|
|
wxShop.setTenantId(getTenantId()); |
|
|
|
wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); |
|
|
|
wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); |
|
|
|
wxShopService.exportNotRentShop(wxShop, request, response); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -171,7 +171,7 @@ public class WxShopController extends BaseController { |
|
|
|
wxShop = new WxShop(); |
|
|
|
} |
|
|
|
wxShop.setTenantId(getTenantId()); |
|
|
|
wxShop.setSortColumns(WxShop.Field.CreateDate_DESC,WxShop.Field.Id_DESC); |
|
|
|
wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); |
|
|
|
|
|
|
|
final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
|