From 6c670d497b7c642902daa1b3f2be64012a68a20c Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Mon, 16 Oct 2023 10:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=A1=E6=8A=A5=E8=A1=A8sql=20?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=B5=81=E7=A8=8B=E5=8F=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20231016JS.sql | 36 +++++++++++++++++++ .../controller/admin/flow/FlowController.java | 1 - 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 sql/20231016JS.sql diff --git a/sql/20231016JS.sql b/sql/20231016JS.sql new file mode 100644 index 00000000..d3811e8f --- /dev/null +++ b/sql/20231016JS.sql @@ -0,0 +1,36 @@ +-- 会计报表 +CREATE TABLE `lyr-one`.`archives_accounting_report` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '报表id', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '报表文件名称', + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '报表文件url', + `company_id` bigint(20) NULL DEFAULT NULL COMMENT '业务实体id', + `company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务实体', + `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '细分类型', + `book_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '账套编号', + `year` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会计年度', + `period` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会计期间', + `creator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `updater` datetime NULL DEFAULT NULL COMMENT '修改者', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除', + `encrypt` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '加密', + `archive_id` bigint(20) NULL DEFAULT NULL COMMENT '归档id', + `archive_state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '归档状态', + `dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门id', + `dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '住户编号', + `password` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会计报表表' ROW_FORMAT = Dynamic; + + +-- 新增会计报表权限 +SELECT `id` INTO @menuId FROM `system_menu` WHERE `name`='会计档案'; +INSERT INTO `lyr-one`.`system_menu` (`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('会计报表', '', 2, 3, @menuId, 'report', 'dict', 'accounting/report/index', 'Report', 0, b'1', b'1', b'1', '', '2023-10-16 10:15:31', '', '2023-10-16 10:16:01', b'0'); +SET @menuId2 = LAST_INSERT_ID(); +INSERT INTO `lyr-one`.`system_menu` (`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('创建会计报表', 'archives:accounting-report:create', 3, 1, @menuId2, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-10-16 10:17:24', '', '2023-10-16 10:17:24', b'0'); +INSERT INTO `lyr-one`.`system_menu` (`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('更新会计报表', 'archives:accounting-report:update', 3, 2, @menuId2, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-10-16 10:17:54', '', '2023-10-16 10:17:54', b'0'); +INSERT INTO `lyr-one`.`system_menu` (`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('删除会计报表', 'archives:accounting-report:delete', 3, 3, @menuId2, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-10-16 10:18:13', '', '2023-10-16 10:18:13', b'0'); +INSERT INTO `lyr-one`.`system_menu` (`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('获得会计报表列表', 'archives:accounting-report:query', 3, 4, @menuId2, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-10-16 10:18:36', '', '2023-10-16 10:18:36', b'0'); +INSERT INTO `lyr-one`.`system_menu` (`name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES ('导出会计报表', 'archives:accounting-report:export', 3, 5, @menuId2, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-10-16 10:19:01', '', '2023-10-16 10:19:01', b'0'); diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/FlowController.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/FlowController.java index 2e2eb409..a887b968 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/FlowController.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/FlowController.java @@ -56,7 +56,6 @@ public class FlowController { @Operation(summary = "创建审批流程") @PreAuthorize("@ss.hasPermission('archives:flow:create')") public CommonResult createFlow(@Valid @RequestBody FlowCreateReqVO createReqVO) { - createReqVO.setFlowCode(execute()); return success(flowService.createFlow(createReqVO)); }