feat(接口): 修改资料调整逻辑

app/controller/api/v1/Worker.php

@@ -157,7 +157,7 @@ class Worker extends Base
                     }
                 }
 
-                if (!$checkLog = CheckLog::where('account_id', $accountId)->where('status', CheckLog::COMMON_OFF)
+                if (!$checkLog = CheckLog::where('account_id', $accountId)->whereIn('status', [CheckLog::COMMON_OFF, -1])
                     ->find()) {
                     // 没有待审核的记录则新增
                     $insert['created_at']  = date('Y-m-d H:i:s');

app/model/CheckLog.php

@@ -16,7 +16,7 @@ class CheckLog extends Base
         return self::alias('cl')
             ->leftJoin('position p', 'p.id = cl.position')
             ->where('cl.account_id', $accountId)
-//            ->whereIn('cl.status', [self::COMMON_OFF, -1])
+            ->whereIn('cl.status', [self::COMMON_OFF, -1])
             ->field('cl.*,p.name as position_name')
             ->order('cl.id', 'desc')
             ->find();

app/service/Pay.php

@@ -2,6 +2,7 @@
 
 namespace app\service;
 
+use app\model\Account;
 use app\model\ClockLog;
 use app\model\Log;
 use app\model\OvertimeLog;
@@ -177,6 +178,7 @@ class Pay
         $where = [
             ['year', '=', $year],
             ['month', '=', $month],
+            ['role', '=', Account::ROLE_WORKER],
         ];
 
         // 每次统计 都讲之前的结果清理，插入新计算结果

view/manager/pay/edit.html

@@ -33,7 +33,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">状态</label>
                 <div class="layui-input-block">
-                    <input type="text" readonly class="layui-input" value="{if $item.amount == $item.paid_amount}全部发放{/if}
+                    <input type="text" readonly class="layui-input" value="{if $item.amount == $item.paid_amount && $item.amount > 0}全部发放{/if}
                         {if $item.paid_amount <= 0}待发放{/if}
                         {if $item.paid_amount > 0 && $item.paid_amount < $item.amount}部分发放{/if}">