|
|
@@ -28,9 +28,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@RestController
|
|
|
@@ -235,5 +233,28 @@ public class CollectionController extends BaseController {
|
|
|
public List<Collection> setScancodeOasis(@RequestBody List<Long> oasisIds) {
|
|
|
return collectionService.setOasisScancode(oasisIds);
|
|
|
}
|
|
|
+
|
|
|
+ @GetMapping("/count/{search}")
|
|
|
+ public Map<String, String> countNum(@PathVariable String search) {
|
|
|
+ PageQuery pageQuery = new PageQuery();
|
|
|
+ pageQuery.setPage(0);
|
|
|
+ pageQuery.setSize(1);
|
|
|
+ pageQuery.getQuery().put("onShelf",true);
|
|
|
+ pageQuery.getQuery().put("source","TRANSFER");
|
|
|
+ pageQuery.getQuery().put("del",false);
|
|
|
+ pageQuery.setSearch(search);
|
|
|
+ pageQuery.getQuery().put("salable",false);
|
|
|
+ long onlyShowNum = collectionService.all(pageQuery).getTotal();
|
|
|
+ pageQuery.getQuery().put("salable",true);
|
|
|
+ long consignmentNum = collectionService.all(pageQuery).getTotal();
|
|
|
+ pageQuery.getQuery().remove("salable");
|
|
|
+ pageQuery.getQuery().put("inPaying",true);
|
|
|
+ long transactingNum= collectionService.all(pageQuery).getTotal();
|
|
|
+ Map<String, String> map = new HashMap<>();
|
|
|
+ map.put("onlyShowNum", String.valueOf(onlyShowNum));
|
|
|
+ map.put("consignmentNum", String.valueOf(consignmentNum));
|
|
|
+ map.put("transactingNum", String.valueOf(transactingNum));
|
|
|
+ return map;
|
|
|
+ }
|
|
|
}
|
|
|
|