|
@@ -542,12 +542,13 @@ public class KuaishouItemListController extends BaseController {
|
|
public TableDataInfo getJYOrderItemList(
|
|
public TableDataInfo getJYOrderItemList(
|
|
@ApiParam("开始时间") @RequestParam(value = "startDate", required = false) String startDate,
|
|
@ApiParam("开始时间") @RequestParam(value = "startDate", required = false) String startDate,
|
|
@ApiParam("结束时间") @RequestParam(value = "endDate", required = false) String endDate,
|
|
@ApiParam("结束时间") @RequestParam(value = "endDate", required = false) String endDate,
|
|
|
|
+ @ApiParam("商品标题") @RequestParam(value = "itemTitle", required = false) String itemTitle,
|
|
@ApiParam("pageNum") @RequestParam(value = "pageNum", required = false) Long pageNum,
|
|
@ApiParam("pageNum") @RequestParam(value = "pageNum", required = false) Long pageNum,
|
|
@ApiParam("pageSize") @RequestParam(value = "pageSize", required = false) Long pageSize
|
|
@ApiParam("pageSize") @RequestParam(value = "pageSize", required = false) Long pageSize
|
|
) {
|
|
) {
|
|
try {
|
|
try {
|
|
startPage();
|
|
startPage();
|
|
- List<JYOrderItemList> list = kuaishouItemListService.getJYOrderItemList(startDate, endDate);
|
|
|
|
|
|
+ List<JYOrderItemList> list = kuaishouItemListService.getJYOrderItemList(itemTitle, startDate, endDate);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -563,7 +564,7 @@ public class KuaishouItemListController extends BaseController {
|
|
public void export(HttpServletResponse response,
|
|
public void export(HttpServletResponse response,
|
|
@ApiParam("开始时间") @RequestParam(value = "startDate", required = false) String startDate,
|
|
@ApiParam("开始时间") @RequestParam(value = "startDate", required = false) String startDate,
|
|
@ApiParam("结束时间") @RequestParam(value = "endDate", required = false) String endDate) {
|
|
@ApiParam("结束时间") @RequestParam(value = "endDate", required = false) String endDate) {
|
|
- List<JYOrderItemList> list = kuaishouItemListService.getJYOrderItemList(startDate, endDate);
|
|
|
|
|
|
+ List<JYOrderItemList> list = kuaishouItemListService.getJYOrderItemList(null, startDate, endDate);
|
|
ExcelUtil<JYOrderItemList> util = new ExcelUtil<JYOrderItemList>(JYOrderItemList.class);
|
|
ExcelUtil<JYOrderItemList> util = new ExcelUtil<JYOrderItemList>(JYOrderItemList.class);
|
|
util.exportExcel(response, list, "骄阳商品信息数据");
|
|
util.exportExcel(response, list, "骄阳商品信息数据");
|
|
}
|
|
}
|