north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -180,6 +180,17 @@ } } map.put("title", uniqueList); for (int i=0;i<uniqueList.size();i++){ BasicData basicData = basicDataMapper.selectOne( new QueryWrapper<BasicData>() .eq("basic_category","process") .eq("basic_name",uniqueList.get(i).get("process")) .last("limit 1") ); if(basicData!=null && (Objects.equals(basicData.getNickname(), "stepB") || (Objects.equals(basicData.getNickname(), "stepD")))){ columns.add(15+i); } } List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);