工资数据计算

application/api/controller/StaffSalary.php

@@ -55,22 +55,22 @@ class StaffSalary extends Api
         if (!$startDateInRange || !$endDateInRange) {
             $this->error('日期参数错误');
         }
-        $options = [
-            'host'       => '127.0.0.1',
-            'port'       => 6379,
-            'password'   => '123456',
-            'select'     => 15,
-            'timeout'    => 0,
-            'expire'     => 0,
-            'persistent' => false,
-            'prefix'     => '',
-        ];
-        $redis = new Redis($options);
-        $taskIdentifier = md5(json_encode('date'));
-        $queueKey =  $redis->get($taskIdentifier);
-        if ($queueKey){
-            $this->success('数据正在处理中,请等待...');
-        }
+        // $options = [
+        //     'host'       => '127.0.0.1',
+        //     'port'       => 6379,
+        //     'password'   => '123456',
+        //     'select'     => 15,
+        //     'timeout'    => 0,
+        //     'expire'     => 0,
+        //     'persistent' => false,
+        //     'prefix'     => '',
+        // ];
+        // // $redis = new Redis($options);
+        // $taskIdentifier = md5(json_encode('date'));
+        // $queueKey =  $redis->get($taskIdentifier);
+        // if ($queueKey){
+        //     $this->success('数据正在处理中,请等待...');
+        // }
         $vacationOneArr = [];
         if (!empty($params['vacation_one_start']) && !empty($params['vacation_one_end'])){
             $vacationOneStart = strtotime($params['vacation_one_start']);
@@ -97,7 +97,7 @@ class StaffSalary extends Api
             $this->error('法定天数未设置');
         }
         //将起止日期内数据删除
-        $delRes = \db('绩效工资汇总')->where('sczl_rq','between',[$startDate,$endDate])->delete();
+        // $delRes = \db('绩效工资汇总')->where('sczl_rq','between',[$startDate,$endDate])->delete();
         //设备产量计酬报工数据查询
         $where = [];
         $where['a.sczl_rq'] = ['between',[$startDate,$endDate]];
@@ -249,7 +249,7 @@ class StaffSalary extends Api
                 }
             }
         }
-//        halt($data);
+       halt($data);
         /**
          * 拆片工序数据
          */