pms 非生产时效

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/vo/IotRhDailyReportPageReqVO.java

@@ -136,4 +136,7 @@ public class IotRhDailyReportPageReqVO extends PageParam {
 
     @Schema(description = "年", example = "2025")
     private String year;
+
+    @Schema(description = "非生产时效", example = "Y")
+    private String nonProductFlag;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotReportOrderController.java

@@ -110,6 +110,11 @@ public class IotReportOrderController {
                 }
             }
         }
+
+        List<AllOrderResp> dailyReports = iotRhDailyReportMapper.selectStatusNumber(pageReqVO);
+        List<AllOrderResp> ryDailyReports = iotRyDailyReportMapper.selectStatusNumber(pageReqVO);
+        List<AllOrderResp> rdDailyReports = iotRdDailyReportMapper.selectStatusNumber(pageReqVO);
+
         Long hbWxNum = 0L;
         Long hbXjNum = 0L;
         Long hbYxNum = 0L;
@@ -134,9 +139,6 @@ public class IotReportOrderController {
         // 同比 去年同期相同统计数据对比 无数据
         tbByNum = tbByNum == null ? 0l : tbByNum;
 
-        List<AllOrderResp> dailyReports = iotRhDailyReportMapper.selectStatusNumber(pageReqVO);
-        List<AllOrderResp> ryDailyReports = iotRyDailyReportMapper.selectStatusNumber(pageReqVO);
-        List<AllOrderResp> rdDailyReports = iotRdDailyReportMapper.selectStatusNumber(pageReqVO);
         List<AllOrderResp> reports = new ArrayList<>();
         AtomicReference<Long> noStatus = new AtomicReference<>(0l);
         AtomicReference<Long> yesStatus = new AtomicReference<>(0l);

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/iotprojecttask/IotRhDailyReportMapper.xml

@@ -180,6 +180,9 @@
                 #{key}
             </foreach>
         </if>
+        <if test="reqVO.nonProductFlag != null and reqVO.nonProductFlag != ''">
+            AND rdr.non_production_time > 0
+        </if>
         <if test="reqVO.createTime != null and reqVO.createTime.length > 0">
             <!-- 处理“开始时间”（数组第1位，如 createTime[0] = 2024-01-01 00:00:00） -->
             <if test="reqVO.createTime[0] != null">