czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品库存导出未带入分类参数

This commit is contained in:
GYJ 2024-07-11 18:48:38 +08:00
parent 46f85fe5fb
commit b6df6fd74d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
View File

@ -95,12 +95,14 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
"pro.shopId = :shopId " +
"AND pro.status = 1 " +
"AND sku.isDel=0 " +
"AND (:categoryId IS NULL OR pro.categoryId = :categoryId) " +
"AND (:proName IS NULL OR pro.name LIKE %:proName%) " +
"AND (:isStock IS NULL OR pro.isStock = :isStock) " +
"group by pro.id " +
"ORDER BY " +
"pro.name DESC,sku.stockNumber DESC")
List<StockV2Vo> searchProStockV2(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock);
List<StockV2Vo> searchProStockV2(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock,
@Param("categoryId") String categoryId);
@Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" +

3
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
View File

@ -102,7 +102,8 @@ public class StockServiceImpl implements StockService {
@Override
public void downloadV2(StockQueryDto summaryDto, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
List<StockV2Vo> stockVos = tbProductSkuRepository.searchProStockV2(summaryDto.getShopId(), summaryDto.getName(), summaryDto.getIsStock());
List<StockV2Vo> stockVos = tbProductSkuRepository.searchProStockV2(summaryDto.getShopId(), summaryDto.getName(),
summaryDto.getIsStock(), summaryDto.getCategoryId());
for (StockV2Vo all : stockVos) {
if (all.getIsDistribute().equals(1)) {
Map<String, Object> map = new LinkedHashMap<>();