From 42f805d7ccacc3e5bca5836eff84a7ed0c6702c8 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 21 Jul 2023 20:59:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1.=E4=BB=AA=E8=A1=A8=E7=9B=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=AF=E8=A7=81=E6=80=A7=E6=9C=89=E6=88=91?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E4=B8=8D=E6=98=AF=E6=88=91=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=E7=9A=84bug=20=EF=BC=8C2.=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AF=84=E8=AE=BA=E9=97=B4=E8=B7=9D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8E=E5=8F=AF=E8=AF=84=E8=AE=BAemoj?=
 =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=8A=A0=E8=AF=84=E8=AE=BA=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=20=EF=BC=8C3,=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E4=BA=A4=E9=9B=86?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=85=E4=BB=BB=E5=8A=A1=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20=EF=BC=8C4.=20=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D,=205.=20=E5=AE=A1=E6=89=B9=E6=B7=BB=E5=8A=A0=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E5=90=8E=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?=E4=B8=8B=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/ApproveController.php     | 24 ++++++++++++++++++-
 .../Controllers/Api/ProjectController.php     |  4 ++--
 docker-compose.yml                            |  2 +-
 .../js/pages/manage/approve/details.vue       | 22 +++++++++++++----
 .../assets/js/pages/manage/approve/index.vue  |  1 -
 resources/assets/js/pages/manage/calendar.vue |  2 +-
 .../pages/manage/components/ProjectPanel.vue  |  2 +-
 resources/assets/js/store/getters.js          |  4 ++--
 resources/assets/sass/pages/page-approve.scss |  3 +--
 resources/views/push/bot.blade.php            | 12 ++++++++++
 10 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php
index d0c408515..35f871fd2 100755
--- a/app/Http/Controllers/Api/ApproveController.php
+++ b/app/Http/Controllers/Api/ApproveController.php
@@ -190,12 +190,25 @@ class ApproveController extends AbstractController
         $data['userid'] = (string)$user->userid;
         $data['content'] = Request::input('content'); //内容+图片
 
+        $processInst = $this->getProcessById($data['proc_inst_id']);
+
         $ret = Ihttp::ihttp_post($this->flow_url.'/api/v1/workflow/process/addGlobalComment', json_encode(Base::arrayKeyToCamel($data)));
         $process = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true);
         if (!$process || $process['status'] != 200) {
             return Base::retError($process['message'] ?? '添加失败');
         }
-        //
+
+        // 推送通知
+        $botUser = User::botGetOrCreate('approval-alert');
+        foreach ( $processInst['userids'] as $id) {
+            if($id != $user->userid){
+                $dialog = WebSocketDialog::checkUserDialog($botUser, $id);
+                $processInst['comment_user_id'] = $user->userid;
+                $processInst['comment_content'] = json_decode($data['content'],true)['content'];
+                $this->approveMsg('approve_comment_notifier', $dialog, $botUser, $processInst, $processInst);
+            }
+        }
+        
         $res = Base::arrayKeyToUnderline($process['data']);
         return Base::retSuccess('success', $res);
     }
@@ -958,6 +971,8 @@ class ApproveController extends AbstractController
             'type' => $process['var']['type'],
             'start_time' => $process['var']['start_time'],
             'end_time' => $process['var']['end_time'],
+            'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '',
+            'comment_content' => $process['comment_content'] ?? ''
         ];
         $text = view('push.bot', ['type' => $type, 'action' => $action, 'is_finished' => $process['is_finished'], 'data' => (object)$data])->render();
         $text = preg_replace("/^\x20+/", "", $text);
@@ -1011,6 +1026,7 @@ class ApproveController extends AbstractController
         }
         //
         $res = Base::arrayKeyToUnderline($process['data']);
+        $res['userids'] = [];
         foreach ($res['node_infos'] as &$val) {
             if (isset($val['node_user_list'])) {
                 $node = $val['node_user_list'];
@@ -1020,10 +1036,12 @@ class ApproveController extends AbstractController
                         continue;
                     }
                     $val['node_user_list'][$k]['userimg'] = User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname);
+                    $res['userids'][] = $item['target_id'];
                 }
             }else if($val['aprover_id']){
                 $info = User::whereUserid($val['aprover_id'])->first();
                 $val['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : '';
+                $res['userids'][] = $val['aprover_id'];
             }
         }
         // 全局评论
@@ -1039,6 +1057,10 @@ class ApproveController extends AbstractController
         }
         $info = User::whereUserid($res['start_user_id'])->first();
         $res['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : '';
+        // 
+        $res['userids'][] = $info->userid;
+        $res['userids'] = array_unique($res['userids']);
+        // 
         return $res;
     }
 
diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 613177483..91bbf462b 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1079,8 +1079,8 @@ class ProjectController extends AbstractController
                     $timerange = explode(',', $timerange);
                 }
                 if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) {
-                    $query->where('project_tasks.start_at', '>=', Carbon::parse($timerange[0])->startOfDay());
-                    $query->where('project_tasks.end_at', '<=', Carbon::parse($timerange[1])->endOfDay());
+                    $query->where('project_tasks.start_at', '<=', Carbon::parse($timerange[1])->endOfDay());
+                    $query->where('project_tasks.end_at', '>=', Carbon::parse($timerange[0])->startOfDay());
                 }
             })
             ->when(!empty($taskid), function ($query) use ($taskid) {
diff --git a/docker-compose.yml b/docker-compose.yml
index 8e656f032..b89aba407 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -150,7 +150,7 @@ services:
 
   approve:
     container_name: "dootask-approve-${APP_ID}"
-    image: "hitosea2020/go-approve:latest"
+    image: "hitosea2020/go-approve:0.1.1"
     environment:
       TZ: "Asia/Shanghai"
       MYSQL_HOST: "${DB_HOST}"
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index 1f9616fc6..b2fd8c984 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="approve-details" :style="{'z-index':modalTransferIndex}">
-        <div class="approve-details-box">
+        <div class="approve-details-box" ref="approveDetailsBox">
             <h2 class="approve-details-title">
                 <span>{{$L(datas.proc_def_name)}}</span>
                 <Tag v-if="datas.state == 0" color="cyan">{{$L('待审批')}}</Tag>
@@ -292,7 +292,7 @@ export default {
             }
         },
         // 获取详情
-        getInfo(){
+        getInfo(isScrollToBottom = false) {
             this.$store.dispatch("call", {
                 method: 'get',
                 url: 'approve/process/detail',
@@ -308,8 +308,9 @@ export default {
                     }
                     return item;
                 })
-                this.$nextTick(()=>{
+                this.$nextTick(() => {
                     this.datas = data
+                    isScrollToBottom && this.scrollToBottom();
                 })
             }).catch(({msg}) => {
                 $A.modalError(msg);
@@ -401,9 +402,12 @@ export default {
             }).then(({msg}) => {
                 $A.messageSuccess("添加成功");
                 if(this.$route.name=='manage-approve-details' || this.$route.name=='manage-messenger'){
-                    this.getInfo()
+                    this.getInfo(true)
                 }else{
                     this.$emit('approve')
+                    setTimeout(() => {
+                        this.scrollToBottom()
+                    }, 500);
                 }
                 this.commentShow = false;
             }).catch(({msg}) => {
@@ -412,6 +416,14 @@ export default {
                 this.loadIng--;
             });
         },
+        // 滚动到容器底部
+        scrollToBottom() {
+            const container = this.$refs.approveDetailsBox
+            container.scrollTo({
+                top: container.scrollHeight + 1000,
+                behavior: 'smooth' 
+            });
+        },
         // 获取内容
         getContent(content){
             try {
@@ -420,7 +432,7 @@ export default {
                 return ''
             }
         },
-        // 获取内容
+        // 获取图片
         getPictures(content){
             try {
                 return JSON.parse(content).pictures || []
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index 86801b788..1e02c1fd9 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -8,7 +8,6 @@
                     <h1>{{$L('审批中心')}}</h1>
                 </div>
                 <Button type="primary" @click="addApply">{{$L("添加申请")}}</Button>
-                <!-- <Button v-for="(item,key) in procdefList" :loading="loadIng > 0" :key="key" type="primary" @click="initiate(item)" style="margin-right:10px;">{{$L(item.name)}}</Button> -->
             </div>
 
             <Tabs :value="tabsValue" @on-click="tabsClick" style="margin: 0 20px;height: 100%;"  size="small">
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 139d61ac6..3cdd24fec 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -156,7 +156,7 @@ export default {
                 if (!task.end_at) {
                     return false;
                 }
-                return task.owner;
+                return task.owner == 1;
             }
             let array = cacheTasks.filter(task => filterTask(task));
             if (taskCompleteTemps.length > 0) {
diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 061539554..f485dbe14 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -1413,7 +1413,7 @@ export default {
                     return false;
                 }
             }
-            return task.owner;
+            return task.owner == 1;
         },
 
         helpFilter(task, chackCompleted = true) {
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index f09468559..5f2b9f6b0 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -124,7 +124,7 @@ export default {
             if (task.complete_at && chackCompleted === true) {
                 return false;
             }
-            return task.owner;
+            return task.owner == 1;
         }
         let array = state.cacheTasks.filter(task => filterTask(task));
         let tmpCount = 0;
@@ -174,7 +174,7 @@ export default {
             if (task.complete_at && chackCompleted === true) {
                 return false;
             }
-            return task.assist && !task.owner;
+            return task.assist && task.owner === 0;
         }
         let array = state.cacheTasks.filter(task => filterTask(task));
         if (state.taskCompleteTemps.length > 0) {
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index 6694c7991..2df712ac7 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -242,8 +242,7 @@
 
         .approve-record-comment {
             padding: 10px;
-            margin-bottom: 30px;
-
+            padding-bottom: 0;
             .top {
                 display: flex;
                 gap: 8px;
diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php
index ed9c10706..bb462c14b 100755
--- a/resources/views/push/bot.blade.php
+++ b/resources/views/push/bot.blade.php
@@ -145,6 +145,18 @@
         <Button type="button" class="ivu-btn" style="flex: 1;">查看详情</Button>
         @endif
     </div></span>
+@elseif ($type === 'approve_comment_notifier')
+    <span class="open-approve-details" data-id="{{$data->id}}">{{$data->comment_nickname}}评论了此审批</b>
+    <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
+        <b>评论内容</b>
+        <span>{{$data->comment_content}}</span>
+    </div><div class="btn-raw">
+        @if ($is_finished == 1)
+        <Button type="button" class="ivu-btn" style="flex: 1;">已同意</Button>
+        @else
+        <Button type="button" class="ivu-btn" style="flex: 1;">查看详情</Button>
+        @endif
+    </div></span>
 @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>