fix:修复export1添加筛选条件

.idea/phpunit.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPUnit">
+    <option name="directories">
+      <list>
+        <option value="$PROJECT_DIR$/tests/Unit" />
+        <option value="$PROJECT_DIR$/tests/Feature" />
+      </list>
+    </option>
+  </component>
+</project>

.idea/video_system.iml

@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/Modules" isTestSource="false" packagePrefix="Modules\" />
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/Modules/Admin/" isTestSource="false" packagePrefix="Modules\Admin\" />
+      <sourceFolder url="file://$MODULE_DIR$/Modules/Camera/" isTestSource="false" packagePrefix="Modules\Camera\" />
+      <sourceFolder url="file://$MODULE_DIR$/Modules/Email/" isTestSource="false" packagePrefix="Modules\Email\" />
+      <sourceFolder url="file://$MODULE_DIR$/Modules/Log/" isTestSource="false" packagePrefix="Modules\Log\" />
+      <sourceFolder url="file://$MODULE_DIR$/Modules/Mine/" isTestSource="false" packagePrefix="Modules\Mine\" />
+      <sourceFolder url="file://$MODULE_DIR$/Modules/OpcData/" isTestSource="false" packagePrefix="Modules\OpcData\" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="AlibabaCloud\SDK\Sample\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/Feature" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/Unit" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/aliyuncs/oss-sdk-php" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/box/spout" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/defuse/php-encryption" />

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -3033,6 +3033,7 @@ class CameraApiController extends BaseController
             ->whereDate('t.create_time', $date)
             ->where('t.is_delete',0)
             ->where('t.delete_type',0)
+            ->where('current_step','结束节点')
             ->whereNotNull('t.flow_id');
 
         if (!empty($coal_washery_id)) $risk_list->where('t.coal_washery_id', $coal_washery_id); // 筛选洗煤厂