gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix:【工作汇报】修复新增今天的周报，提示要覆盖昨天日报的问题

Browse Source
This commit is contained in:
韦荣超 2022-01-22 12:06:21 +08:00
parent 1f96af1024
commit 463e67d64c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/ReportController.php
View File

@ -188,7 +188,7 @@ class ReportController extends AbstractController
$sign = Report::generateSign($input["type"], $input["offset"]); $sign = Report::generateSign($input["type"], $input["offset"]);
// 检查唯一标识是否存在 // 检查唯一标识是否存在
if (empty($input["id"])) { if (empty($input["id"])) {
if (Report::query()->whereSign($sign)->count() > 0) if (Report::query()->whereSign($sign)->whereType($input["type"])->count() > 0)
throw new ApiException("请勿重复提交工作汇报"); throw new ApiException("请勿重复提交工作汇报");
} }
$report = Report::createInstance([ $report = Report::createInstance([
@ -273,7 +273,7 @@ class ReportController extends AbstractController
} }
// 生成唯一标识 // 生成唯一标识
$sign = Report::generateSign($type, 0, Carbon::instance($start_time)); $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
$one = Report::query()->whereSign($sign)->first(); $one = Report::query()->whereSign($sign)->whereType($type)->first();
// 如果已经提交了相关汇报 // 如果已经提交了相关汇报
if ($one && $id > 0) { if ($one && $id > 0) {
return Base::retSuccess('success', [ return Base::retSuccess('success', [