From 20d01ac6d9fb329620168a52abef39c5907d812b Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Mon, 20 Nov 2023 14:40:46 +0800
Subject: [PATCH] fixed

---
 app/common/logic/task/TaskLogic.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index 130ca195c..a70a92715 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -1183,9 +1183,9 @@ class TaskLogic extends BaseLogic
             if ($item == 'town_task_type_master_4') {
                 $typeIds[] =$k;
             }
-            if ($item == 'town_task_type_master_5') {
-                $typeIds[] = $k;
-            }
+//            if ($item == 'town_task_type_master_5') {
+//                $typeIds[] = $k;
+//            }
             if ($item == 'town_task_type_master_8') {
                 $typeIds[] = $k;
             }
@@ -1194,7 +1194,7 @@ class TaskLogic extends BaseLogic
         // 查询 镇农科公司负责人是否有对应的每日任务安排
         $templateList = TaskTemplate::where(['company_id'=>$townCompany['id']])->whereIn('type', $typeIds)->select()->toArray();
         // 未做任务安排的小组服务公司不在判定范围内，跳出本次循环
-        if(count($templateList) === 4) {
+        if(count($templateList) === 3) {
             $isTaskSchedule = 1;
             // 查询负责人的循环任务有没有全部做完 任意有一个任务没有做完，则判定为 协助总负责人开展工作任务 失败
             foreach ($templateList as $template) {
@@ -2251,7 +2251,7 @@ class TaskLogic extends BaseLogic
         $isDone = 1; // 任务是否完成标记
         $isTaskSchedule = 0; // 下属小组服务公司是否有每日任务安排标记
 
-        // 负责人任务类型id列表
+        // 负责人 每日任务类型id列表
         $typeIds = [];
         $townMasterTaskTypeList = DictData::where(['type_value' => 'town_task_type_master', 'status' => 1])->column('value', 'id');
         foreach ($townMasterTaskTypeList as $k=>$item) {
@@ -2261,9 +2261,9 @@ class TaskLogic extends BaseLogic
             if ($item == 'town_task_type_master_4') {
                 $typeIds[] = $k;
             }
-            if ($item == 'town_task_type_master_5') {
-                $typeIds[] = $k;
-            }
+//            if ($item == 'town_task_type_master_5') {
+//                $typeIds[] = $k;
+//            }
             if ($item == 'town_task_type_master_8') {
                 $typeIds[] = $k;
             }