diff --git a/src/main/java/com/zg/project/wisdom/controller/PhotoController.java b/src/main/java/com/zg/project/wisdom/controller/PhotoController.java index 9526282..091d8d9 100644 --- a/src/main/java/com/zg/project/wisdom/controller/PhotoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/PhotoController.java @@ -76,6 +76,12 @@ public class PhotoController { return AjaxResult.success(photoService.listUrlsByBill(billNo, photoType)); } + @GetMapping("/listData") + public AjaxResult listData(@RequestParam("billNo") String billNo, + @RequestParam(value = "photoType", required = false) String photoType) { + return AjaxResult.success(photoService.listsByBill(billNo, photoType)); + } + /** * 【删除:按 URL 列表】 * @param dto @@ -87,4 +93,8 @@ public class PhotoController { Map result = photoService.deleteByUrls(dto.getUrls()); return AjaxResult.success("删除完成", result); } + @GetMapping("/deleteById") + public AjaxResult deleteById(@RequestParam("id") Integer id){ + return AjaxResult.success(photoService.deleteById(id)); + } } diff --git a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java index 276a86a..c31fcf2 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java @@ -254,4 +254,26 @@ public class RkInfoController extends BaseController } + @PostMapping("/pageStatistics") + public Map pageStatistics(@RequestBody(required = false) RkInfoQueryDTO dto) { + + if (dto == null) { + dto = new RkInfoQueryDTO(); + } + + // 使用 PageHelper 分页 + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = rkInfoService.selectAllRkInfo(dto); +// 统计金额 + Long sumMoney = rkInfoService.selectStatistics(dto); +// 统计库位 + Long pcdeCount = rkInfoService.selectPcde(dto); + Map dataInfo = new HashMap<>(); + dataInfo.put("dataList",getDataTable(list)); + dataInfo.put("sumMoney",sumMoney); + dataInfo.put("pcdeCount",pcdeCount); + return dataInfo; + + } + } diff --git a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java index 4670697..a74c7a1 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java @@ -234,4 +234,7 @@ public interface RkInfoMapper * 查询 rk_info 全量明细(仅未删除) */ List selectAllRkInfo(RkInfo query); + Long selectStatistics(RkInfo query); + + Long selectPcde(RkInfo query); } diff --git a/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java index 3c5378d..5235e0a 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java @@ -33,4 +33,6 @@ public interface StockPhotoMapper { * @return */ int softDeleteByUrls(@Param("urls") List urls); + + int DeleteById(Integer id); } diff --git a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java index b9bff7c..b532685 100644 --- a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java +++ b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java @@ -1,6 +1,7 @@ package com.zg.project.wisdom.service; import java.util.List; +import java.util.Map; import com.zg.project.Inventory.domain.dto.QueryDTO; import com.zg.project.Inventory.domain.vo.ChartDataVO; @@ -167,4 +168,7 @@ public interface IRkInfoService */ List selectAllRkInfo(RkInfo query); + Long selectStatistics(RkInfo query); + + Long selectPcde(RkInfo query); } diff --git a/src/main/java/com/zg/project/wisdom/service/PhotoService.java b/src/main/java/com/zg/project/wisdom/service/PhotoService.java index fc656e0..0289da3 100644 --- a/src/main/java/com/zg/project/wisdom/service/PhotoService.java +++ b/src/main/java/com/zg/project/wisdom/service/PhotoService.java @@ -33,6 +33,7 @@ public interface PhotoService { * 按 billNo(可选 photoType)查询照片 URL 列表 */ List listUrlsByBill(String billNo, String photoType); + List> listsByBill(String billNo, String photoType); /** * 按 URL 批量删除(仅数据库软删,不删除磁盘文件) @@ -41,4 +42,5 @@ public interface PhotoService { */ Map deleteByUrls(List urls); + public int deleteById(Integer id); } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java index 9aff2ee..382d281 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java @@ -110,6 +110,33 @@ public class PhotoServiceImpl implements PhotoService { .collect(Collectors.toList()); } + @Override + public List> listsByBill(String billNo, String photoType) { + if (StringUtils.isBlank(billNo)) { + throw new IllegalArgumentException("billNo 不能为空"); + } + +// return stockPhotoMapper.selectByBillNo(billNo, +// StringUtils.isBlank(photoType) ? null : photoType) +// .stream() +// .map(product -> StockPhotoDTO.builder() +// .id(product.getId()) +// .name(product.getName()) +// .price(product.getPrice() * 1.1) // 价格增加10% +// .build()) +// .collect(Collectors.toList()); + List> result = stockPhotoMapper.selectByBillNo(billNo, + StringUtils.isBlank(photoType) ? null : photoType).stream() + .map(photo -> { + Map map = new HashMap<>(); + map.put("url", photo.getUrl()); + map.put("id", photo.getId()); + return map; + }) + .collect(Collectors.toList()); + return result; + } + /** * 批量删除 * @param urls 待删URL列表 @@ -129,4 +156,9 @@ public class PhotoServiceImpl implements PhotoService { ret.put("dbUpdated", dbUpdated); return ret; } + @Override + public int deleteById(Integer id){ + return stockPhotoMapper.DeleteById(id); + + } } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java index b630adf..09a43fc 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java @@ -1003,4 +1003,18 @@ public class RkInfoServiceImpl implements IRkInfoService public List selectAllRkInfo(RkInfo query) { return rkInfoMapper.selectAllRkInfo(query); } + + @Override + public Long selectStatistics(RkInfo query) { + return rkInfoMapper.selectStatistics(query); + } + + @Override + public Long selectPcde(RkInfo query) { + return rkInfoMapper.selectPcde(query); + } + + + + } diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index d115fca..67afd28 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -998,4 +998,144 @@ ORDER BY ri.create_time DESC, ri.id DESC + + + + diff --git a/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml b/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml index fb16d15..7d14747 100644 --- a/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml +++ b/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml @@ -67,6 +67,13 @@ #{u} + + UPDATE stock_photo + SET is_delete = '1', + update_time = NOW() + WHERE id = #{Id} + +