|
|
@@ -964,7 +964,10 @@ public class SupplyChainController extends BaseController {
|
|
|
@ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
@ApiParam("商品Id") @RequestParam(value = "itemId", required = false) Long itemId,
|
|
|
- @ApiParam("商品名称") @RequestParam(value = "itemTitle", required = false) String itemTitle) {
|
|
|
+ @ApiParam("商品名称") @RequestParam(value = "itemTitle", required = false) String itemTitle,
|
|
|
+ @ApiParam("排序字段") @RequestParam(value = "fieId", required = false) String fieId,
|
|
|
+ @ApiParam("排序方式") @RequestParam(value = "sort", required = false) String sort
|
|
|
+ ) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(userId)) {
|
|
|
requestMap.put("userId", userId);
|
|
|
@@ -983,6 +986,9 @@ public class SupplyChainController extends BaseController {
|
|
|
if (!Check.isNull(itemTitle)) {
|
|
|
requestMap.put("itemTitle", itemTitle);
|
|
|
}
|
|
|
+ requestMap.put("fieId", fieId);
|
|
|
+ requestMap.put("sort", sort);
|
|
|
+
|
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
|
if (Check.isNullMap(requestMap)) {
|
|
|
dataInfo.setCode(-1);
|
|
|
@@ -996,6 +1002,18 @@ public class SupplyChainController extends BaseController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
+ * 商品认领汇总
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @GetMapping("/itemBindSummary")
|
|
|
+ @ApiOperation(value = "商品认领汇总")
|
|
|
+ public JSONObject itemBindSummary() {
|
|
|
+ JSONObject json = supplyChainService.itemBindSummary();
|
|
|
+ return json;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
* 首页-时段对比
|
|
|
*
|
|
|
* @param orderStartDate
|