用料材质

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

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.bo.WasteMaterialBo;
 import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
 import com.ruoyi.zdsz.domain.vo.WasteMaterialVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringWasteMaterialVo;
@@ -59,19 +60,19 @@ public class ZEngineeringWasteMaterialController extends BaseController {
      * 四大工程 统计展示 PC用料统计
      */
     @GetMapping("/engineeringIndustryList")
-    public R<List> engineeringIndustryList(ZEnginMaterialQualityBo bo) { // 工业工程
+    public R<List> engineeringIndustryList(WasteMaterialBo bo) { // 工业工程
         return R.ok(izEngineeringWasteMaterialService.engineeringIndustryList(bo));
     }
     @GetMapping("/engineeringMunicipalList")
-    public R<List> engineeringMunicipalList(ZEnginMaterialQualityBo bo) { // 市政工程
+    public R<List> engineeringMunicipalList(WasteMaterialBo bo) { // 市政工程
         return R.ok(izEngineeringWasteMaterialService.engineeringMunicipalList(bo));
     }
     @GetMapping("/engineeringPipeJackingList")
-    public R<List> engineeringPipeJackingList(ZEnginMaterialQualityBo bo) { // 顶管工程
+    public R<List> engineeringPipeJackingList(WasteMaterialBo bo) { // 顶管工程
         return R.ok(izEngineeringWasteMaterialService.engineeringPipeJackingList(bo));
     }
     @GetMapping("/engineeringInfrastructureList")
-    public R<List> engineeringInfrastructureList(ZEnginMaterialQualityBo bo) { // 基建工程
+    public R<List> engineeringInfrastructureList(WasteMaterialBo bo) { // 基建工程
         return R.ok(izEngineeringWasteMaterialService.engineeringInfrastructureList(bo));
     }
     /**
@@ -79,22 +80,22 @@ public class ZEngineeringWasteMaterialController extends BaseController {
      */
     @Log(title = "工业工程用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/engineeringIndustryExport")
-    public void engineeringIndustryList(ZEnginMaterialQualityBo bo, HttpServletResponse response) { // 工业工程
+    public void engineeringIndustryList(WasteMaterialBo bo, HttpServletResponse response) { // 工业工程
         ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringIndustryList(bo), "用料统计", WasteMaterialVo.class, response);
     }
     @Log(title = "市政工程用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/engineeringMunicipalExport")
-    public void engineeringMunicipalList(ZEnginMaterialQualityBo bo, HttpServletResponse response) { // 市政工程
+    public void engineeringMunicipalList(WasteMaterialBo bo, HttpServletResponse response) { // 市政工程
         ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringIndustryList(bo), "市政工程用料统计", WasteMaterialVo.class, response);
     }
     @Log(title = "顶管工程用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/engineeringPipeJackingExport")
-    public void engineeringPipeJackingList(ZEnginMaterialQualityBo bo, HttpServletResponse response) { // 顶管工程
+    public void engineeringPipeJackingList(WasteMaterialBo bo, HttpServletResponse response) { // 顶管工程
         ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringIndustryList(bo), "顶管工程用料统计", WasteMaterialVo.class, response);
     }
     @Log(title = "基建工程用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/engineeringInfrastructureExport")
-    public void engineeringInfrastructureList(ZEnginMaterialQualityBo bo, HttpServletResponse response) { // 基建工程
+    public void engineeringInfrastructureList(WasteMaterialBo bo, HttpServletResponse response) { // 基建工程
         ExcelUtil.exportExcel(izEngineeringWasteMaterialService.engineeringIndustryList(bo), "基建工程用料统计", WasteMaterialVo.class, response);
     }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEnginMaterialQualityBo.java

@@ -37,14 +37,12 @@ public class ZEnginMaterialQualityBo extends BaseEntity {
     private String enginStep;
     private String nameType;
     private String materialType;
-    private String materialStatistics; // 用料材质
 
     /**
      * 材质名称
      */
     @NotBlank(message = "材质名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
-    private String enginName; // 工程名称
 
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringWasteMaterialService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.zdsz.service;
 
+import com.ruoyi.zdsz.domain.bo.WasteMaterialBo;
 import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
 import com.ruoyi.zdsz.domain.vo.WasteMaterialVo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringWasteMaterialVo;
@@ -20,8 +21,8 @@ public interface IZEngineeringWasteMaterialService {
     ZEngineeringWasteMaterialVo queryEngineeringPipeJacking(String id);
     ZEngineeringWasteMaterialVo queryTouchOperationEngineering(String id);
 
-    List<WasteMaterialVo> engineeringIndustryList(ZEnginMaterialQualityBo bo);
-    List<Map> engineeringMunicipalList(ZEnginMaterialQualityBo bo);
-    List<Map> engineeringPipeJackingList(ZEnginMaterialQualityBo bo);
-    List<Map> engineeringInfrastructureList(ZEnginMaterialQualityBo bo);
+    List<WasteMaterialVo> engineeringIndustryList(WasteMaterialBo bo);
+    List<WasteMaterialVo> engineeringMunicipalList(WasteMaterialBo bo);
+    List<WasteMaterialVo> engineeringPipeJackingList(WasteMaterialBo bo);
+    List<WasteMaterialVo> engineeringInfrastructureList(WasteMaterialBo bo);
 }

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.zdsz.domain.ZEngineeringGY;
 import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
+import com.ruoyi.zdsz.domain.bo.WasteMaterialBo;
 import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
@@ -528,7 +529,7 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
     /**
      * PC用料统计列表 Echarts图表
      */
-    public List<WasteMaterialVo> engineeringIndustryList(ZEnginMaterialQualityBo bo){
+    public List<WasteMaterialVo> engineeringIndustryList(WasteMaterialBo bo){
         LambdaQueryWrapper<ZEngineeringGY> lqw = Wrappers.lambdaQuery();
 //        LambdaQueryWrapper<TestDemo> lqw = Wrappers.lambdaQuery();
 //        lqw.like(StringUtils.isNotBlank(bo.getTestKey()), TestDemo::getTestKey, bo.getTestKey());
@@ -536,7 +537,7 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         lqw.eq(StringUtils.isNotBlank(bo.getEnginSort()), ZEngineeringGY::getEnginClassification, bo.getEnginSort()); // 工程分类
 //        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGY::getEnginType, bo.getEnginType()); // 工程类型
 //        lqw.eq(StringUtils.isNotBlank(bo.getMaterialQuality()), ZEngineeringGY::getEnginClassification, bo.getEnginSort()); // 用料材质
-        lqw.eq(StringUtils.isNotBlank(bo.getMaterialStatistics()), ZEngineeringGY::getEnginClassification, bo.getEnginSort()); // 用料材质
+//        lqw.eq(StringUtils.isNotBlank(bo.getMaterialStatistics()), ZEngineeringGY::getEnginClassification, bo.getEnginSort()); // 用料材质
         List<ZEngineeringGYVo> list = gyMapper.selectVoList(lqw);
 //        List<Map> mapList = new ArrayList<>();
         List<WasteMaterialVo> resultList = new ArrayList<>();
@@ -564,9 +565,9 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
     //                        continue;
                         }else {
                             String type = zEnginMaterialQualityMapper.selectVoById(materialQuality).getMaterialType();
-                            if("0".equals(type)){
+                            if("0".equals(type) && (bo.getMaterialStatistics() == null || materialQuality.equals(bo.getMaterialStatistics()))){
                                 pesj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))) );
-                            }else if("1".equals(type)){
+                            }else if("1".equals(type) && (bo.getMaterialStatistics() == null || materialQuality.equals(bo.getMaterialStatistics()))){
                                 gsj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))) );
                             }
                         }
@@ -606,13 +607,13 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
 //        return mapList;
         return resultList;
     }
-    public List<Map> engineeringMunicipalList(ZEnginMaterialQualityBo bo){
+    public List<WasteMaterialVo> engineeringMunicipalList(WasteMaterialBo bo){
         return null;
     }
-    public List<Map> engineeringPipeJackingList(ZEnginMaterialQualityBo bo){
+    public List<WasteMaterialVo> engineeringPipeJackingList(WasteMaterialBo bo){
         return null;
     }
-    public List<Map> engineeringInfrastructureList(ZEnginMaterialQualityBo bo){
+    public List<WasteMaterialVo> engineeringInfrastructureList(WasteMaterialBo bo){
         return null;
     }