修复控制台临时工报表

app/Http/Controllers/TestController.php

@@ -1510,4 +1510,20 @@ TEXT;
         $logistic_number = $request->logistic_number;
         \App\Jobs\LogisticZopSync::dispatchNow($logistic_number);
     }
+
+    public function laborReportsCountingRecordsCacheClear()
+    {
+        $dayClears = now()->subYear()->daysUntil(now());
+        $monthClears = now()->subYear()->monthsUntil(now());
+        foreach ($dayClears as $day) {
+            $key = 'laborReportsCountingRecords_' . $day->toDateString() . '_日';
+            Cache::forget($key);
+        }
+        foreach ($monthClears as $month) {
+            $key = 'laborReportsCountingRecords_' . $month->format('Y-m') . '_月';
+            Cache::forget($key);
+        }
+        Cache::forget('laborReportsCountingRecords_2020_年');
+        Cache::forget('laborReportsCountingRecords_2021_年');
+    }
 }

app/Services/LaborReportsCountingRecordService.php

@@ -6,25 +6,27 @@ namespace App\Services;
 
 use App\LaborReport;
 use Carbon\Carbon;
-use DateTime;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
-use Ramsey\Uuid\Type\Integer;
 use App\Traits\ServiceAppAop;
 
 
 class LaborReportsCountingRecordService
 {
     use ServiceAppAop;
-    protected $modelClass=LaborReportsCountingRecord::class;
+
+    private $ttl;
+
     public function __construct(LaborReport $laborReport)
     {
+        $this->ttl = config('cache.expirations.commonFrequent');
         $laborReport::$withoutAppends = false;
     }
+
     public function userGroupsCount($start, $end)
     {
-        $resultByCache = Cache::remember('userGroupsCount_' . $start . '_' . $end, 600, function () use ($start, $end) {
+
+        $resultByCache = Cache::remember('userGroupsCount_' . $start . '_' . $end, $this->ttl, function () use ($start, $end) {
             return LaborReport::query()->selectRaw('user_workgroup_id,count(user_workgroup_id) amount')
                 ->with('userWorkgroup', 'laborReportStatus')
                 ->whereDate('created_at', '>=', $start)
@@ -103,7 +105,7 @@ class LaborReportsCountingRecordService
                 break;
             case '年';
                 foreach (Carbon::parse($start)->yearsUntil($end, 1)->toArray() as $item) {
-                    $dataArray[] = $item->year.'';
+                    $dataArray[] = $item->year . '';
                 }
                 break;
             default:
@@ -127,7 +129,7 @@ class LaborReportsCountingRecordService
                 $dataList->each(function ($item) use ($unit) {
                     $date = $item->date_target;
                     $key = 'laborReportsCountingRecords_' . $date . '_' . $unit;
-                    Cache::put($key, $item);
+                    Cache::put($key, $item, $this->ttl);
                 });
                 break;
             case '月':
@@ -143,7 +145,7 @@ class LaborReportsCountingRecordService
                 $dataList->each(function ($item) use ($unit) {
                     $date = $item->date_target;
                     $key = 'laborReportsCountingRecords_' . $date . '_' . $unit;
-                    Cache::put($key, $item);
+                    Cache::put($key, $item, $this->ttl);
                 });
                 break;
             case '年':
@@ -158,7 +160,7 @@ class LaborReportsCountingRecordService
                 $dataList->each(function ($item) use ($unit) {
                     $date = $item->date_target;
                     $key = 'laborReportsCountingRecords_' . $date . '_' . $unit;
-                    Cache::put($key, $item);
+                    Cache::put($key, $item, $this->ttl);
                 });
                 break;
             default:

app/Services/LogisticZopService.php

@@ -30,7 +30,7 @@ class LogisticZopService implements LogisticRouteInterface
 
     public function format($nativeResponse)
     {
-        if (is_null($nativeResponse)||isEmpty($nativeResponse->result)) {//返回的结果为空，或者路由为[] 直接返回就好
+        if (is_null($nativeResponse)||empty($nativeResponse->result)) {//返回的结果为空，或者路由为[] 直接返回就好
             return [];
         }
         $nativeRoutes = $nativeResponse->result;

tests/Feature/LogisticZopSyncTest.php

@@ -39,7 +39,7 @@ class LogisticZopSyncTest extends TestCase
 
     public function test_get()
     {
-        LogisticZopSync::dispatch('75600256515921');
+        LogisticZopSync::dispatch('75600296655116');
     }
 
 

yarn.lock

@@ -1324,6 +1324,11 @@ base64-arraybuffer@0.1.5:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
   integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
+base64-arraybuffer@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.nlark.com/base64-arraybuffer/download/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45"
+  integrity sha1-S5RPrAGRqlkHr+LYyZnMxXzoD0U=
+
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
@@ -2143,6 +2148,13 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
+css-line-break@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.nlark.com/css-line-break/download/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef"
+  integrity sha1-1em90peEAJnrBQPHMQ/TSSegJu8=
+  dependencies:
+    base64-arraybuffer "^0.2.0"
+
 css-loader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
@@ -3434,6 +3446,13 @@ html-minifier@^3.5.8:
     relateurl "0.2.x"
     uglify-js "3.4.x"
 
+html2canvas@^1.0.0-rc.7:
+  version "1.0.0-rc.7"
+  resolved "https://registry.npm.taobao.org/html2canvas/download/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98"
+  integrity sha1-cMFZzg5jlUqRFpUxiU0IrVYnrJg=
+  dependencies:
+    css-line-break "1.1.1"
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -4055,10 +4074,10 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-laravel-echo@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/laravel-echo/-/laravel-echo-1.8.0.tgz#ecc8cbf37d7ddf9c4752c301f55cbeee76a6d025"
-  integrity sha512-hEHmNKUgV3fR2Do/2PKxfO3OiLmbjX89tahGEi4urS8JEuy/yoRtFToOJXV9ChtOpRqxo7trrygPOvXLwvc/6A==
+laravel-echo@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.npm.taobao.org/laravel-echo/download/laravel-echo-1.10.0.tgz#b7a3615baf563fadfe242589ad1e302acc931dad"
+  integrity sha1-t6NhW69WP63+JCWJrR4wKsyTHa0=
 
 laravel-mix@^4.1.4:
   version "4.1.4"
@@ -7136,6 +7155,11 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
+yarn@^1.22.10:
+  version "1.22.10"
+  resolved "https://registry.npm.taobao.org/yarn/download/yarn-1.22.10.tgz#c99daa06257c80f8fa2c3f1490724e394c26b18c"
+  integrity sha1-yZ2qBiV8gPj6LD8UkHJOOUwmsYw=
+
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"