diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java index 23f823864..3acc6e418 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java @@ -142,6 +142,14 @@ public class LJOrderServiceImpl extends ServiceImpl impl @Override public Map selectOrderFenxiDataByZtDz(LJOrderVo order){ + if (ObjectUtil.isEmpty(order.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + order.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + order.setStoreIds(longs); Map stringObjectMap = baseMapper.selectOrderFenxiDataByZtDz(order); Map stringObjectMap2 = baseMapper.selectOrderFenxiDataByZtDz2(order); stringObjectMap.put("cvg",stringObjectMap2.get("cvg")); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index edda1b647..d78528fbb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -203,6 +203,7 @@ public class OilOrderServiceImpl extends ServiceImpl i } return oilOrderIPage; } +// 查询油品分析 列表 @Override public IPage selectOilOrderFenXiListByZtDz(Page page, OilOrderVo order) { if (ObjectUtil.isEmpty(order.getDeptId())) { @@ -238,9 +239,18 @@ public class OilOrderServiceImpl extends ServiceImpl i } return oilOrderIPage; } - +// 查询油品分析 累计 public Map selectOilOrderFenXiDataByZtDz(OilOrderVo order){ - return baseMapper.selectOilOrderFenXiDataByZtDz(order); + if (ObjectUtil.isEmpty(order.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + order.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + order.setStoreIds(longs); + Map stringStringMap = baseMapper.selectOilOrderFenXiDataByZtDz(order); + return stringStringMap; } public void export(HttpServletResponse response, OilOrder order) {