|
|
@@ -236,9 +236,11 @@ public class CollectionController extends BaseController {
|
|
|
long transactingNum = collectionService.all(pageQuery).getTotal();
|
|
|
Long destroyedAssets = 0L;
|
|
|
Long total = 0L;
|
|
|
+ Long stock = 0L;
|
|
|
destroyedAssets = collectionService.countDestroyAssets(search);
|
|
|
total = collectionRepo.sumAllByNameLike("%" + search + "%");
|
|
|
- Long tranferCount = total - destroyedAssets;
|
|
|
+ stock = collectionRepo.sumStockByNameLike("%" + search + "%");
|
|
|
+ Long tranferCount = total - destroyedAssets - stock;
|
|
|
Map<String, String> map = new HashMap<>();
|
|
|
map.put("onlyShowNum", String.valueOf(onlyShowNum));
|
|
|
map.put("consignmentNum", String.valueOf(consignmentNum));
|