Merge branch 'develop'

This commit is contained in:
mzl
2025-09-24 19:12:13 +08:00
parent 04208b3b5c
commit b897771541
31 changed files with 5899 additions and 895 deletions
+31 -30
View File
@@ -9,6 +9,7 @@ use app\common\utils\scaffold\Generate;
use support\Request;
use support\Db;
use support\Cache;
use support\Redis;
class IndexController
{
@@ -69,42 +70,42 @@ class IndexController
*/
public function createResource()
{
$options = [
'controller' => [
'module' => 'crm',
'name' => 'approval_flows'
],
'model' => [
'module' => 'crm',
'name' => 'approval_flows'
],
'service' => [
'module' => 'crm',
'name' => 'approval_flows'
],
'logic' => [
'module' => 'crm',
'name' => 'approval_flows'
],
'validate' => [
'module' => 'crm',
'name' => 'approval_flows'
],
'table' => 'approval_flows'
];
// $options = [
// 'controller' => [
// 'module' => 'common',
// 'name' => 'purchase_order_items'
// ],
// 'model' => [
// 'module' => 'common',
// 'name' => 'purchase_order_items'
// ],
// 'service' => [
// 'module' => 'common',
// 'name' => 'purchase_order_items'
// ],
// 'logic' => [
// 'module' => 'common',
// 'name' => 'purchase_order_items'
// ],
// 'validate' => [
// 'module' => 'common',
// 'name' => 'purchase_order_items'
// ],
// 'table' => 'purchase_order_items'
// ];
$result = (new Generate($options))->doGenerate();
return $result;
// $result = (new Generate($options))->doGenerate();
// return $result;
}
public function test(Request $request)
{
// 菜单迁移
// $where[] = ['id', '>', 141];
// $list = (new \app\common\utils\MigrationResources())->do('resources_20250916_bak', 'resources_yuanshi', $where);
$list = (new \app\common\utils\MigrationResources())->getFullResourceTreeOptimized('resources_20250916_bak', []);
var_dump($list);
$info = \app\common\model\PurchaseOrders::find(14);
$service = new \app\common\service\PurchaseOrdersService();
$result = $service->startApproval($info);
return json($result);
}
}