统计

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringWasteMaterialController.java

@@ -85,16 +85,16 @@ public class ZEngineeringWasteMaterialController extends BaseController {
     @Log(title = "市政工程用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/engineeringMunicipalExport")
     public void engineeringMunicipalList(WasteMaterialBo bo, HttpServletResponse response) { // 市政工程
-        ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringIndustryList(bo), "市政工程用料统计", WasteMaterialVo.class, response);
+        ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringMunicipalList(bo), "市政工程用料统计", WasteMaterialVo.class, response);
     }
     @Log(title = "顶管工程用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/engineeringPipeJackingExport")
     public void engineeringPipeJackingList(WasteMaterialBo bo, HttpServletResponse response) { // 顶管工程
-        ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringIndustryList(bo), "顶管工程用料统计", WasteMaterialVo.class, response);
+        ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringPipeJackingList(bo), "顶管工程用料统计", WasteMaterialVo.class, response);
     }
     @Log(title = "基建工程用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/engineeringInfrastructureExport")
     public void engineeringInfrastructureList(WasteMaterialBo bo, HttpServletResponse response) { // 基建工程
-        ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringIndustryList(bo), "基建工程用料统计", WasteMaterialVo.class, response);
+        ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringInfrastructureList(bo), "基建工程用料统计", WasteMaterialVo.class, response);
     }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringWasteMaterialServiceImpl.java

@@ -706,7 +706,8 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
             }
             wasteMaterialVo.setEnginName(zEngineeringPipeJackingVo.getEnginName()); // 工程名称
 //            wasteMaterialVo.setEnginClassification(zEngineeringGYVo.getEnginClassification()); // 工程分类
-            wasteMaterialVo.setEnginClassification(zEngineeringPipeJackingVo.getEnginScale()); // 工程规模
+//            wasteMaterialVo.setEnginClassification(zEngineeringPipeJackingVo.getEnginScale()); // 工程规模
+            wasteMaterialVo.setEnginClassification("顶管工程"); // 工程分类
             Map pe = new HashMap(); // PE材料
             pe.put("actuality", getRoundDouble(pesj.get(), 2)); // 实际
             pe.put("anticipation", zEngineeringPipeJackingVo.getPePreset()); // 预计  divide zEngineeringGYVo.getGcPreset()