From 7f89a76a76cfd30fda2f2d524549e2f394959747 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 27 Nov 2024 09:15:44 +0800 Subject: [PATCH] * [misc] The default language items of the project initiation approval flow will be migrated to the open-source version. --- db/zentao.sql | 8 ++++---- module/upgrade/lang/de.php | 17 +++++++++++++++++ module/upgrade/lang/en.php | 17 +++++++++++++++++ module/upgrade/lang/fr.php | 17 +++++++++++++++++ module/upgrade/lang/zh-cn.php | 17 +++++++++++++++++ module/upgrade/model.php | 4 ++-- 6 files changed, 74 insertions(+), 6 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 401b739719..656c11b265 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -14449,10 +14449,10 @@ CREATE TABLE `zt_scene` ( REPLACE INTO `zt_approvalflow` (`id`, `name`, `code`, `desc`, `version`, `createdBy`, `createdDate`, `workflow`, `deleted`) VALUES (1, '最简审批', 'simple', '', 1, 'admin', '2022-04-29 08:46:40', '', 0), -(2, '立项审批流', 'projectApproval', '可以为发起立项审批设计审批流程。', 1, 'system', NOW(), '', 0), -(3, '结项审批流', 'completionApproval', '可以为发起结项审批设计审批流程。', 1, 'system', NOW(), '', 0), -(4, '取消立项审批流', 'cancelProjectApproval', '可以为取消立项审批设计审批流程。', 1, 'system', NOW(), '', 0), -(5, '激活立项审批流', 'activateProjectApproval', '可以为激活立项审批设计审批流程。', 1, 'system', NOW(), '', 0); +(2, '立项审批流', 'projectApproval', '可以为发起立项审批设计审批流程。', 1, 'system', NOW(), 'charter', 0), +(3, '结项审批流', 'completionApproval', '可以为发起结项审批设计审批流程。', 1, 'system', NOW(), 'charter', 0), +(4, '取消立项审批流', 'cancelProjectApproval', '可以为取消立项审批设计审批流程。', 1, 'system', NOW(), 'charter', 0), +(5, '激活立项审批流', 'activateProjectApproval', '可以为激活立项审批设计审批流程。', 1, 'system', NOW(), 'charter', 0); REPLACE INTO `zt_approvalflowspec` (`id`, `flow`, `version`, `nodes`, `createdBy`, `createdDate`) VALUES (1, 1, 1, '[{\"type\":\"start\",\"ccs\":[]},{\"id\":\"3ewcj92p55e\",\"type\":\"approval\",\"title\":\"审批\",\"reviewType\":\"manual\",\"multiple\":\"and\",\"agentType\":\"pass\",\"reviewers\":[{\"type\":\"select\"}],\"ccs\":[]},{\"type\":\"end\",\"ccs\":[]}]', 'admin', '2022-04-29 08:46:40'), diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php index e5cfaa4d6f..f0632ece12 100644 --- a/module/upgrade/lang/de.php +++ b/module/upgrade/lang/de.php @@ -187,3 +187,20 @@ $lang->upgrade->flowFields['program'] = 'Program'; $lang->upgrade->flowFields['product'] = 'Product'; $lang->upgrade->flowFields['project'] = 'Project'; $lang->upgrade->flowFields['execution'] = 'Execution'; + +$lang->upgrade->defaultCharterApprovalFlow = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->title = 'Project Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->desc = 'You can design the approval process for initiating project approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->completionApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->title = 'Project Completion Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->desc = 'You can design the approval process for initiating project completion approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->title = 'Project Cancellation Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = 'You can design the approval process for canceling project approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = 'Project Activation Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = 'You can design the approval process for activating project approval.'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index eb9de01f41..c1a4eee705 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -187,3 +187,20 @@ $lang->upgrade->flowFields['program'] = 'Program'; $lang->upgrade->flowFields['product'] = 'Product'; $lang->upgrade->flowFields['project'] = 'Project'; $lang->upgrade->flowFields['execution'] = 'Execution'; + +$lang->upgrade->defaultCharterApprovalFlow = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->title = 'Project Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->desc = 'You can design the approval process for initiating project approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->completionApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->title = 'Project Completion Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->desc = 'You can design the approval process for initiating project completion approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->title = 'Project Cancellation Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = 'You can design the approval process for canceling project approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = 'Project Activation Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = 'You can design the approval process for activating project approval.'; diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php index 2705ce64b4..b5ea6786e6 100644 --- a/module/upgrade/lang/fr.php +++ b/module/upgrade/lang/fr.php @@ -187,3 +187,20 @@ $lang->upgrade->flowFields['program'] = 'Program'; $lang->upgrade->flowFields['product'] = 'Product'; $lang->upgrade->flowFields['project'] = 'Project'; $lang->upgrade->flowFields['execution'] = 'Execution'; + +$lang->upgrade->defaultCharterApprovalFlow = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->title = 'Project Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->desc = 'You can design the approval process for initiating project approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->completionApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->title = 'Project Completion Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->desc = 'You can design the approval process for initiating project completion approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->title = 'Project Cancellation Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = 'You can design the approval process for canceling project approval.'; + +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = 'Project Activation Approval Workflow'; +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = 'You can design the approval process for activating project approval.'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 73ded4a096..23cd62e1b0 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -187,3 +187,20 @@ $lang->upgrade->flowFields['program'] = '所属项目集'; $lang->upgrade->flowFields['product'] = '所属产品'; $lang->upgrade->flowFields['project'] = '所属项目'; $lang->upgrade->flowFields['execution'] = '所属执行'; + +$lang->upgrade->defaultCharterApprovalFlow = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->title = '立项审批流'; +$lang->upgrade->defaultCharterApprovalFlow->projectApproval->desc = '可以为发起立项审批设计审批流程。'; + +$lang->upgrade->defaultCharterApprovalFlow->completionApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->title = '结项审批流'; +$lang->upgrade->defaultCharterApprovalFlow->completionApproval->desc = '可以为发起结项审批设计审批流程。'; + +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->title = '取消立项审批流'; +$lang->upgrade->defaultCharterApprovalFlow->cancelProjectApproval->desc = '可以为取消立项审批设计审批流程。'; + +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval = new stdclass(); +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->title = '激活立项审批流'; +$lang->upgrade->defaultCharterApprovalFlow->activateProjectApproval->desc = '可以为激活立项审批设计审批流程。'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 93a522785a..e7d31a77da 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -10474,7 +10474,7 @@ class upgradeModel extends model { $this->app->loadLang('charter'); - foreach($this->lang->charter->defaultApprovalFlow as $approvalType => $approval) + foreach($this->lang->upgrade->defaultCharterApprovalFlow as $approvalType => $approval) { $approvalflow = new stdclass(); $approvalflow->name = $approval->title; @@ -10483,7 +10483,7 @@ class upgradeModel extends model $approvalflow->version = 1; $approvalflow->createdBy = 'system'; $approvalflow->createdDate = helper::now(); - $approvalflow->workflow = ''; + $approvalflow->workflow = 'charter'; $approvalflow->deleted = 0; $this->dao->insert(TABLE_APPROVALFLOW)->data($approvalflow)->exec();