Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.dtflys.forest.annotation.Post;
 import com.ruoyi.zdsz.domain.vo.MaterialStatisticsListVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
@@ -44,7 +45,7 @@ public class ZMaterialStatisticsController extends BaseController {
      * 查询用料统计列表
      */
     //@SaCheckPermission("zdsz:materialStatistics:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
     public R list(@RequestBody ZMaterialStatisticsBo bo) {
         return R.ok(iZMaterialStatisticsService.queryList(bo));
     }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZMaterialStatisticsMapper.xml

@@ -73,7 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and b.material_quality = #{realityQuality}
         </if>
         <if test="realitySpecifications != null  and realitySpecifications != ''">
-            and b.reality_specifications = #{realitySpecifications}
+            and b.estimated_specifications = #{realitySpecifications}
+        </if>
+        <if test="enginCycle != null  and enginCycle != ''">
+            and a.engin_cycle = #{enginCycle}
         </if>
 
     </select>