mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed 镇合伙人公司任务审批

Browse Source
This commit is contained in:
chenbo 2023-11-28 09:59:28 +08:00
parent ddfcb98b60
commit cdb46846a4
1 changed files with 7 additions and 7 deletions

14
app/adminapi/controller/approve/ApproveController.php

@ -99,7 +99,7 @@ class ApproveController extends BaseAdminController
->where('is_pay',0) ->where('is_pay',0)
->with(['template_info']) ->with(['template_info'])
->withJoin(['scheduling'], 'left') ->withJoin(['scheduling'], 'left')
->where('scheduling.company_type', 41) ->where('scheduling.company_type', 16)
->find() ->find()
->toArray(); ->toArray();
TaskLogic::dealTaskMarketingDirector10($taskSchedulePlan, $approve); TaskLogic::dealTaskMarketingDirector10($taskSchedulePlan, $approve);
@ -139,7 +139,7 @@ class ApproveController extends BaseAdminController
->where('is_pay',0) ->where('is_pay',0)
->with(['template_info']) ->with(['template_info'])
->withJoin(['scheduling'], 'left') ->withJoin(['scheduling'], 'left')
->where('scheduling.company_type', 41) ->where('scheduling.company_type', 16)
->find() ->find()
->toArray(); ->toArray();
TaskLogic::masterTask7Settlement($taskSchedulePlan); TaskLogic::masterTask7Settlement($taskSchedulePlan);
@ -149,7 +149,7 @@ class ApproveController extends BaseAdminController
->where('is_pay',0) ->where('is_pay',0)
->with(['template_info']) ->with(['template_info'])
->withJoin(['scheduling'], 'left') ->withJoin(['scheduling'], 'left')
->where('scheduling.company_type', 41) ->where('scheduling.company_type', 16)
->find() ->find()
->toArray(); ->toArray();
TaskLogic::masterTask8Settlement($taskSchedulePlan); TaskLogic::masterTask8Settlement($taskSchedulePlan);
@ -304,22 +304,22 @@ class ApproveController extends BaseAdminController
->toArray()[0]; ->toArray()[0];
TaskLogic::dealVillageTask5($taskSchedulingPaln, $approve); TaskLogic::dealVillageTask5($taskSchedulingPaln, $approve);
} }
// 镇农科服务部长-督促小组服务团队入股村管理公司任务 // 镇合伙人服务部长-督促小组服务团队入股村管理公司任务
if ($approve->type == Approve::APPROVE_TYPE_13) { if ($approve->type == Approve::APPROVE_TYPE_13) {
$taskSchedulingPaln = TaskSchedulingPlan::where(['task_id' => $task->id]) $taskSchedulingPaln = TaskSchedulingPlan::where(['task_id' => $task->id])
->withJoin(['scheduling'], 'left') ->withJoin(['scheduling'], 'left')
->where('scheduling.company_type', 41) ->where('scheduling.company_type', 16)
->where('is_pay',0) ->where('is_pay',0)
->with(['template_info']) ->with(['template_info'])
->select() ->select()
->toArray()[0]; ->toArray()[0];
TaskLogic::dealTownTask6($taskSchedulingPaln, $approve); TaskLogic::dealTownTask6($taskSchedulingPaln, $approve);
} }
// 镇农科负责人-促成村联络员入股甲方 // 镇合伙人负责人-促成村联络员入股甲方
if ($approve->type == Approve::APPROVE_TYPE_14) { if ($approve->type == Approve::APPROVE_TYPE_14) {
$taskSchedulingPaln = TaskSchedulingPlan::where(['task_id' => $task->id]) $taskSchedulingPaln = TaskSchedulingPlan::where(['task_id' => $task->id])
->withJoin(['scheduling'], 'left') ->withJoin(['scheduling'], 'left')
->where('scheduling.company_type', 41) ->where('scheduling.company_type', 16)
->where('is_pay',0) ->where('is_pay',0)
->with(['template_info']) ->with(['template_info'])
->select() ->select()