yin5th
/
building-sign
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

master
yin5th 2023-01-15 10:53:23 +08:00
parent 7b34b0e8c4
commit f15d8c6c8d
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/api/v1/Worker.php
View File

@ -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()) { ->find()) {
// 没有待审核的记录则新增 // 没有待审核的记录则新增
$insert['created_at'] = date('Y-m-d H:i:s'); $insert['created_at'] = date('Y-m-d H:i:s');

2
app/model/CheckLog.php
View File

@ -16,7 +16,7 @@ class CheckLog extends Base
return self::alias('cl') return self::alias('cl')
->leftJoin('position p', 'p.id = cl.position') ->leftJoin('position p', 'p.id = cl.position')
->where('cl.account_id', $accountId) ->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') ->field('cl.*,p.name as position_name')
->order('cl.id', 'desc') ->order('cl.id', 'desc')
->find(); ->find();

2
app/service/Pay.php
View File

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

2
view/manager/pay/edit.html
View File

@ -33,7 +33,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">状态</label> <label class="layui-form-label">状态</label>
<div class="layui-input-block"> <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}待发放{/if}
{if $item.paid_amount > 0 && $item.paid_amount < $item.amount}部分发放{/if}"> {if $item.paid_amount > 0 && $item.paid_amount < $item.amount}部分发放{/if}">