From 1a5bd35424701efac7ab1f8806f490210f0a2107 Mon Sep 17 00:00:00 2001 From: chiyilin <2449182606@qq.com> Date: Wed, 1 Nov 2023 17:24:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/231101CYL.sql | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 sql/231101CYL.sql diff --git a/sql/231101CYL.sql b/sql/231101CYL.sql new file mode 100644 index 00000000..fc8c210b --- /dev/null +++ b/sql/231101CYL.sql @@ -0,0 +1,32 @@ + +--其他档案业务类型字典 +INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '其他档案业务类型', 'other_business_type', 0, NULL, '', '2023-11-01 16:53:22', '', '2023-11-01 16:53:22', b'0', '1970-01-01 00:00:00'); + +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '政府', '0', 'other_business_type', 0, 'success', '', NULL, '', '2023-11-01 16:54:01', '', '2023-11-01 16:54:01', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '集体', '1', 'other_business_type', 0, 'success', '', NULL, '', '2023-11-01 16:54:10', '', '2023-11-01 16:54:10', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '私人', '2', 'other_business_type', 0, 'success', '', NULL, '', '2023-11-01 16:54:17', '', '2023-11-01 16:54:17', b'0'); + + + + +--咨询类型/资产类型字典 +INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '咨询类型', 'consultation_type', 0, NULL, '', '2023-10-31 16:56:17', '', '2023-10-31 16:56:17', b'0', '1970-01-01 00:00:00'); +INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '资产类型', 'asset_type', 0, NULL, '', '2023-10-31 17:26:01', '', '2023-10-31 17:26:01', b'0', '1970-01-01 00:00:00'); + + + +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '一般性咨询', '0', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:56:53', '', '2023-10-31 16:56:53', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '专业性咨询', '1', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:57:07', '', '2023-10-31 16:57:07', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '事实性咨询', '2', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:57:21', '', '2023-10-31 16:57:21', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '知识性咨询', '3', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:57:35', '', '2023-10-31 16:57:35', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '专题研究性咨询', '4', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:58:00', '', '2023-10-31 16:58:00', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '情报性咨询', '5', 'consultation_type', 0, 'default', '', NULL, '', '2023-10-31 16:58:14', '', '2023-10-31 16:58:14', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '现金', '0', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:14', '', '2023-10-31 17:26:14', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '固定收益类资产', '1', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:26', '', '2023-10-31 17:26:26', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '房地产资产', '2', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:37', '', '2023-10-31 17:26:37', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1359, 3, '现金流资产', '3', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:26:52', '', '2023-10-31 17:26:52', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1360, 4, '非生产性资产', '4', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:05', '', '2023-10-31 17:27:05', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1361, 5, '权益类资产', '5', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:16', '', '2023-10-31 17:27:16', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1362, 6, '债券', '6', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:23', '', '2023-10-31 17:27:23', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1363, 7, '经营性国有资产', '7', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:27:56', '', '2023-10-31 17:27:56', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1364, 8, '黄金', '8', 'asset_type', 0, 'default', '', NULL, '', '2023-10-31 17:28:04', '', '2023-10-31 17:28:04', b'0'); \ No newline at end of file From b6b1628b03ddf3d3f6281885081371f172efc8bd Mon Sep 17 00:00:00 2001 From: chiyilin <2449182606@qq.com> Date: Thu, 2 Nov 2023 10:18:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/depotcabinet/vo/DepotCabinetCreateReqVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/depotcabinet/vo/DepotCabinetCreateReqVO.java b/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/depotcabinet/vo/DepotCabinetCreateReqVO.java index b039c1d5..8a83dce8 100644 --- a/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/depotcabinet/vo/DepotCabinetCreateReqVO.java +++ b/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/controller/admin/depotcabinet/vo/DepotCabinetCreateReqVO.java @@ -14,7 +14,7 @@ public class DepotCabinetCreateReqVO extends DepotCabinetBaseVO { @NotNull(message = "所属库房不能为空") private Long depotId; - @NotNull(message = "档案柜名称不能为空") + @NotNull(message = "档案柜类型不能为空") private String name; } From feb2dbebb1c06e8e2833510ec3eedc051ab4c728 Mon Sep 17 00:00:00 2001 From: JiilingLee <462362@qq.com> Date: Thu, 2 Nov 2023 13:47:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E5=B7=B2=E5=BD=92=E6=A1=A3=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4=202.=E5=8F=91=E7=A5=A8=E5=B7=B2?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=BF=87=E7=9A=84=E4=B8=8D=E8=83=BD=E5=86=8D?= =?UTF-8?q?=E5=85=B3=E8=81=94=203.=E6=B0=B8=E4=B9=85=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E5=B9=B4=E6=95=B0=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/invoices/InvoicesController.java | 4 ++++ .../controller/admin/voucher/VoucherController.java | 5 +++++ .../archives/service/coderule/CodeRuleServiceImpl.java | 3 +++ 3 files changed, 12 insertions(+) diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java index 687a9b7c..5b13573a 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/invoices/InvoicesController.java @@ -75,6 +75,10 @@ public class InvoicesController { @Operation(summary = "更新发票") @PreAuthorize("@ss.hasPermission('accounting:invoices:update')") public CommonResult updateInvoices(@Valid @RequestBody InvoicesUpdateReqVO updateReqVO) { + InvoicesDO invoices = invoicesService.getInvoices(updateReqVO.getId()); + if (invoices.getVoucherId() !=null){ + return error("该发票已被关联"); + } invoicesService.updateInvoices(updateReqVO); return success(true); } diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/voucher/VoucherController.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/voucher/VoucherController.java index b2b1027d..3a01ccfc 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/voucher/VoucherController.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/voucher/VoucherController.java @@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.accounting.dal.dataobject.attachment.AttachmentDO import cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip.BankSlipDO; import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO; import cn.iocoder.yudao.module.accounting.dal.dataobject.invoices.InvoicesDO; +import cn.iocoder.yudao.module.accounting.enums.AccountingStatusEnum; import cn.iocoder.yudao.module.accounting.service.attachment.AttachmentService; import cn.iocoder.yudao.module.accounting.service.bankslip.BankSlipService; import cn.iocoder.yudao.module.accounting.service.flow.FlowService; @@ -97,6 +98,10 @@ public class VoucherController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('accounting:voucher:delete')") public CommonResult deleteVoucher(@RequestParam("id") Long id) { + VoucherDO voucher = voucherService.getVoucher(id); + if (voucher.getFileStatus().equals(AccountingStatusEnum.LOGFILE.getValue())){ + return error("该凭证已归档，请勿删除！"); + } voucherService.deleteVoucher(id); return success(true); } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/coderule/CodeRuleServiceImpl.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/coderule/CodeRuleServiceImpl.java index 0af4df44..df189b5f 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/coderule/CodeRuleServiceImpl.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/coderule/CodeRuleServiceImpl.java @@ -116,6 +116,9 @@ public class CodeRuleServiceImpl implements CodeRuleService { int year = calendar.get(Calendar.YEAR); //保管期限 String timeLimit = authenticateDO.getTimeLimit(); + if (timeLimit.equals("永久保存")){ + timeLimit="30"; + } int year2 = year + Integer.valueOf(timeLimit); //只有延长保存的 synchronized (this) { From 3bc767bcde2489dd56c28f87f2dc62dd3f0fa13d Mon Sep 17 00:00:00 2001 From: zk <2762560464@qq.com> Date: Thu, 2 Nov 2023 13:49:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20231013cyl.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/20231013cyl.sql b/sql/20231013cyl.sql index bb3d4269..a9498c3d 100644 --- a/sql/20231013cyl.sql +++ b/sql/20231013cyl.sql @@ -1,7 +1,7 @@ INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '合同类型', 'contract_type', 0, NULL, '', '2023-09-27 14:47:57', '', '2023-09-27 14:48:10', b'0', '1970-01-01 00:00:00'); INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '劳动合同', '1', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:34', '', '2023-09-27 14:57:34', b'0'); INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '租赁合同', '2', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:42', '', '2023-09-27 14:57:42', b'0'); -INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '买买合同', '3', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:55', '', '2023-09-27 14:57:55', b'0'); +INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '买卖合同', '3', 'contract_type', 0, 'default', '', NULL, '', '2023-09-27 14:57:55', '', '2023-09-27 14:57:55', b'0'); INSERT INTO `lyr-one`.`system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (NULL, '合同状态', 'contract_status', 0, NULL, '', '2023-09-27 14:48:17', '', '2023-09-27 14:48:17', b'0', '1970-01-01 00:00:00'); INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '有效', '1', 'contract_status', 0, 'default', '', NULL, '', '2023-09-27 15:03:53', '', '2023-09-27 15:03:53', b'0'); INSERT INTO `lyr-one`.`system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (NULL, 0, '无效', '2', 'contract_status', 0, 'default', '', NULL, '', '2023-09-27 15:04:01', '', '2023-09-27 15:04:21', b'0');