From 7fe3436819314a894ea8367352a4f1df17eaf4f6 Mon Sep 17 00:00:00 2001
From: ganzizi <zhicheng123@126.com>
Date: Mon, 18 Sep 2023 11:19:29 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A8=E9=80=81=E5=86=85=E5=AE=B9=EF=BC=88?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E4=BA=8B=E7=94=B1=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/ApproveController.php     |  3 +++
 resources/views/push/bot.blade.php            | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php
index da3d8c8c5..8d348d4d7 100755
--- a/app/Http/Controllers/Api/ApproveController.php
+++ b/app/Http/Controllers/Api/ApproveController.php
@@ -975,7 +975,10 @@ class ApproveController extends AbstractController
             'department' => $process['department'],
             'type' => $process['var']['type'],
             'start_time' => $process['var']['start_time'],
+            'start_day_of_week' => '周'.Base::getTimeWeek(Carbon::parse($process['var']['start_time'])->timestamp),
             'end_time' => $process['var']['end_time'],
+            'end_day_of_week' => '周'.Base::getTimeWeek(Carbon::parse($process['var']['end_time'])->timestamp),
+            'description' => $process['var']['description'],
             'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '',
             'comment_content' => $process['comment_content'] ?? ''
         ];
diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php
index 72db8fa6c..9a34117b1 100755
--- a/resources/views/push/bot.blade.php
+++ b/resources/views/push/bot.blade.php
@@ -114,12 +114,13 @@
 @elseif ($type === 'approve_reviewer')
     <span class="open-approve-details" data-id="{{$data->id}}"><b>{{$data->nickname}}提交的「{{$data->proc_def_name}}」待你审批</b>
     <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
-        <b>审批事由</b>
+        <b>详情</b>
         @if ($data->type)
         <span>假期类型：{{$data->type}}</span>
         @endif
-        <span>开始时间：{{$data->start_time}}</span>
-        <span>结束时间：{{$data->end_time}}</span>
+        <span>开始时间：{{$data->start_time}} ({{ $data->start_day_of_week }})</span>
+        <span>结束时间：{{$data->end_time}} ({{ $data->end_day_of_week }})</span>
+        <span>事由：{{$data->description}}</span>
     </div><div class="btn-raw no-dark-content">
         @if ($action === 'pass')
             <button class="ivu-btn">已同意</button>
@@ -135,12 +136,13 @@
 @elseif ($type === 'approve_notifier')
     <span class="open-approve-details" data-id="{{$data->id}}"><b>抄送{{$data->nickname}}提交的「{{$data->proc_def_name}}」记录</b>
     <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
-        <b>审批事由</b>
+        <b>详情</b>
         @if ($data->type)
         <span>假期类型：{{$data->type}}</span>
         @endif
-        <span>开始时间：{{$data->start_time}}</span>
-        <span>结束时间：{{$data->end_time}}</span>
+        <span>开始时间：{{$data->start_time}} ({{ $data->start_day_of_week }})</span>
+        <span>结束时间：{{$data->end_time}} ({{ $data->end_day_of_week }})</span>
+        <span>事由：{{$data->description}}</span>
     </div><div class="btn-raw no-dark-content">
         @if ($is_finished == 1)
         <button class="ivu-btn">已同意</button>
@@ -163,12 +165,13 @@
 @elseif ($type === 'approve_submitter')
     <span class="open-approve-details" data-id="{{$data->id}}"><b>@if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif</b>
     <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->start_nickname}}</span> {{$data->department}}</span>
-        <b>审批事由</b>
+        <b>详情</b>
         @if ($data->type)
         <span>假期类型：{{$data->type}}</span>
         @endif
-        <span>开始时间：{{$data->start_time}}</span>
-        <span>结束时间：{{$data->end_time}}</span>
+        <span>开始时间：{{$data->start_time}} ({{ $data->start_day_of_week }})</span>
+        <span>结束时间：{{$data->end_time}} ({{ $data->end_day_of_week }})</span>
+        <span>事由：{{$data->description}}</span>
     </div><div class="btn-raw no-dark-content">
     @if ($action === 'pass')
             <button class="ivu-btn">已同意</button>