dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后端 BUG

Browse Source
This commit is contained in:
zhaohengkun 2024-09-26 16:37:15 +08:00
parent 85d1a9c1f3
commit 89e1f60ac7
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
View File

@ -142,6 +142,14 @@ public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> impl
@Override @Override
public Map<String, Object> selectOrderFenxiDataByZtDz(LJOrderVo order){ public Map<String, Object> selectOrderFenxiDataByZtDz(LJOrderVo order){
if (ObjectUtil.isEmpty(order.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
order.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
order.setStoreIds(longs);
Map<String, Object> stringObjectMap = baseMapper.selectOrderFenxiDataByZtDz(order); Map<String, Object> stringObjectMap = baseMapper.selectOrderFenxiDataByZtDz(order);
Map<String, Object> stringObjectMap2 = baseMapper.selectOrderFenxiDataByZtDz2(order); Map<String, Object> stringObjectMap2 = baseMapper.selectOrderFenxiDataByZtDz2(order);
stringObjectMap.put("cvg",stringObjectMap2.get("cvg")); stringObjectMap.put("cvg",stringObjectMap2.get("cvg"));

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -203,6 +203,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
} }
return oilOrderIPage; return oilOrderIPage;
} }
// 查询油品分析 列表
@Override @Override
public IPage<OilOrderVo> selectOilOrderFenXiListByZtDz(Page page, OilOrderVo order) { public IPage<OilOrderVo> selectOilOrderFenXiListByZtDz(Page page, OilOrderVo order) {
if (ObjectUtil.isEmpty(order.getDeptId())) { if (ObjectUtil.isEmpty(order.getDeptId())) {
@ -238,9 +239,18 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
} }
return oilOrderIPage; return oilOrderIPage;
} }
// 查询油品分析 累计
public Map<String,String> selectOilOrderFenXiDataByZtDz(OilOrderVo order){ public Map<String,String> selectOilOrderFenXiDataByZtDz(OilOrderVo order){
return baseMapper.selectOilOrderFenXiDataByZtDz(order); if (ObjectUtil.isEmpty(order.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
order.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
order.setStoreIds(longs);
Map<String, String> stringStringMap = baseMapper.selectOilOrderFenXiDataByZtDz(order);
return stringStringMap;
} }
public void export(HttpServletResponse response, OilOrder order) { public void export(HttpServletResponse response, OilOrder order) {