From 9c8eaf7a4be121f3fa5a803b79e98aa758850522 Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Thu, 14 Sep 2023 16:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E7=94=B3=E8=AF=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/borrow_apply20230913JS.sql | 45 ++++++++++--------- .../authenticate/AuthenticateController.java | 2 +- .../vo/AuthenticateExportReqVO.java | 3 ++ .../vo/AuthenticatePageReqVO.java | 3 ++ .../borrowapply/vo/BorrowApplyBaseVO.java | 16 +++---- .../borrowapply/vo/BorrowApplyExcelVO.java | 2 +- .../vo/BorrowApplyExportReqVO.java | 16 +++---- .../borrowapply/vo/BorrowApplyPageReqVO.java | 16 +++---- .../borrowapply/vo/BorrowApplyRespVO.java | 2 +- .../vo/BorrowApplyUpdateReqVO.java | 2 +- .../authenticate/AuthenticateDO.java | 5 +++ .../dataobject/borrowapply/BorrowApplyDO.java | 2 +- .../authenticate/AuthenticateMapper.java | 2 + .../mysql/borrowapply/BorrowApplyMapper.java | 4 +- .../borrowapply/BorrowApplyServiceImpl.java | 2 + .../mapper/borrowapply/BorrowApplyMapper.xml | 12 ----- 16 files changed, 69 insertions(+), 65 deletions(-) delete mode 100644 yudao-module-archives/yudao-module-archives-biz/src/main/resources/mapper/borrowapply/BorrowApplyMapper.xml diff --git a/sql/borrow_apply20230913JS.sql b/sql/borrow_apply20230913JS.sql index 0088770d..1c24726e 100644 --- a/sql/borrow_apply20230913JS.sql +++ b/sql/borrow_apply20230913JS.sql @@ -1,27 +1,28 @@ -- 新增 借阅申请表 CREATE TABLE `lyr-one`.`archives_borrow_apply` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '借阅id', - `borrow_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅申请编码', - `borrow_state` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅申请状态 0:已通过 1驳回', - `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅事由', - `describe` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅描述', - `user_id` bigint(20) NULL DEFAULT NULL COMMENT '借阅人id', - `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅人名称', - `dept_id` bigint(11) NULL DEFAULT NULL COMMENT '借阅部门id', - `dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅部门名称', - `return_time` datetime NULL DEFAULT NULL COMMENT '预计归还日期', - `way` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅方式 0:外接 1:现场查阅', - `media` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '档案介质', - `company_id` bigint(20) NULL DEFAULT NULL COMMENT '业务实体id', - `company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务实体名称', - `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '租户编号', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', - `update_time` datetime NULL DEFAULT NULL COMMENT '修改日期', - `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档案借阅申请表' ROW_FORMAT = Dynamic; - + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '借阅id', + `borrow_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅申请编码', + `borrow_state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅申请状态 0:已通过 1驳回', + `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅事由', + `describes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅描述', + `user_id` bigint(20) NULL DEFAULT NULL COMMENT '借阅人id', + `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅人名称', + `dept_id` bigint(11) NULL DEFAULT NULL COMMENT '借阅部门id', + `dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅部门名称', + `return_time` datetime NULL DEFAULT NULL COMMENT '预计归还日期', + `way` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅方式 0:外接 1:现场查阅', + `media` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '档案介质', + `company_id` bigint(20) NULL DEFAULT NULL COMMENT '业务实体id', + `company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务实体名称', + `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '租户编号', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', + `update_time` datetime NULL DEFAULT NULL COMMENT '修改日期', + `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除', + `creator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者', + `updater` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档案借阅申请表' ROW_FORMAT = DYNAMIC; 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 ( '借阅', '', 1, 0, 0, '/borrow', 'component', NULL, NULL, 0, b'1', b'1', b'1', '', '2023-09-13 15:27:06', '', '2023-09-13 15:27:16', b'0'); SET @menuId = LAST_INSERT_ID(); diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/AuthenticateController.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/AuthenticateController.java index 3131fccf..f52a86d5 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/AuthenticateController.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/AuthenticateController.java @@ -51,7 +51,7 @@ public class AuthenticateController { * @param recordPageReqVO * @return */ - @GetMapping("/get") + @GetMapping("/get/record") @Operation(summary = "获得档案鉴定列表") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('archives:authenticate:query')") diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExportReqVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExportReqVO.java index 47e74c22..be2470ce 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExportReqVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExportReqVO.java @@ -60,4 +60,7 @@ public class AuthenticateExportReqVO { @Schema(description = "备注", example = "你猜") private String remark; + @Schema(description = "鉴定结果",example = "鉴定结果") + private String result; + } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticatePageReqVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticatePageReqVO.java index 799a42a4..9e46831a 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticatePageReqVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticatePageReqVO.java @@ -62,4 +62,7 @@ public class AuthenticatePageReqVO extends PageParam { @Schema(description = "备注", example = "你猜") private String remark; + @Schema(description = "鉴定结果",example = "鉴定结果") + private String result; + } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyBaseVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyBaseVO.java index 95d87b2c..70080219 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyBaseVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyBaseVO.java @@ -24,22 +24,22 @@ public class BorrowApplyBaseVO { @Schema(description = "借阅申请状态 0:已通过 1驳回") private String borrowState; - @Schema(description = "借阅事由", example = "不好") + @Schema(description = "借阅事由", example = "不香") private String reason; @Schema(description = "借阅描述") - private String describe; + private String describes; - @Schema(description = "借阅人id", example = "6652") + @Schema(description = "借阅人id", example = "30243") private Long userId; - @Schema(description = "借阅人名称", example = "李四") + @Schema(description = "借阅人名称", example = "赵六") private String userName; - @Schema(description = "借阅部门id", example = "29611") + @Schema(description = "借阅部门id", example = "17160") private Long deptId; - @Schema(description = "借阅部门名称", example = "张三") + @Schema(description = "借阅部门名称", example = "李四") private String deptName; @Schema(description = "预计归还日期") @@ -52,13 +52,13 @@ public class BorrowApplyBaseVO { @Schema(description = "档案介质") private String media; - @Schema(description = "业务实体id", example = "23211") + @Schema(description = "业务实体id", example = "7747") private Long companyId; @Schema(description = "业务实体名称") private String company; - @Schema(description = "描述", example = "随便") + @Schema(description = "描述", example = "你猜") private String remark; } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExcelVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExcelVO.java index 156dcc31..175162c6 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExcelVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExcelVO.java @@ -30,7 +30,7 @@ public class BorrowApplyExcelVO { private String reason; @ExcelProperty("借阅描述") - private String describe; + private String describes; @ExcelProperty("借阅人id") private Long userId; diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExportReqVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExportReqVO.java index 13d22f17..f19794a4 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExportReqVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExportReqVO.java @@ -19,22 +19,22 @@ public class BorrowApplyExportReqVO { @Schema(description = "借阅申请状态 0:已通过 1驳回") private String borrowState; - @Schema(description = "借阅事由", example = "不好") + @Schema(description = "借阅事由", example = "不香") private String reason; @Schema(description = "借阅描述") - private String describe; + private String describes; - @Schema(description = "借阅人id", example = "6652") + @Schema(description = "借阅人id", example = "30243") private Long userId; - @Schema(description = "借阅人名称", example = "李四") + @Schema(description = "借阅人名称", example = "赵六") private String userName; - @Schema(description = "借阅部门id", example = "29611") + @Schema(description = "借阅部门id", example = "17160") private Long deptId; - @Schema(description = "借阅部门名称", example = "张三") + @Schema(description = "借阅部门名称", example = "李四") private String deptName; @Schema(description = "预计归还日期") @@ -47,13 +47,13 @@ public class BorrowApplyExportReqVO { @Schema(description = "档案介质") private String media; - @Schema(description = "业务实体id", example = "23211") + @Schema(description = "业务实体id", example = "7747") private Long companyId; @Schema(description = "业务实体名称") private String company; - @Schema(description = "描述", example = "随便") + @Schema(description = "描述", example = "你猜") private String remark; @Schema(description = "创建日期") diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyPageReqVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyPageReqVO.java index e3323da9..45ba431b 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyPageReqVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyPageReqVO.java @@ -21,22 +21,22 @@ public class BorrowApplyPageReqVO extends PageParam { @Schema(description = "借阅申请状态 0:已通过 1驳回") private String borrowState; - @Schema(description = "借阅事由", example = "不好") + @Schema(description = "借阅事由", example = "不香") private String reason; @Schema(description = "借阅描述") - private String describe; + private String describes; - @Schema(description = "借阅人id", example = "6652") + @Schema(description = "借阅人id", example = "30243") private Long userId; - @Schema(description = "借阅人名称", example = "李四") + @Schema(description = "借阅人名称", example = "赵六") private String userName; - @Schema(description = "借阅部门id", example = "29611") + @Schema(description = "借阅部门id", example = "17160") private Long deptId; - @Schema(description = "借阅部门名称", example = "张三") + @Schema(description = "借阅部门名称", example = "李四") private String deptName; @Schema(description = "预计归还日期") @@ -49,13 +49,13 @@ public class BorrowApplyPageReqVO extends PageParam { @Schema(description = "档案介质") private String media; - @Schema(description = "业务实体id", example = "23211") + @Schema(description = "业务实体id", example = "7747") private Long companyId; @Schema(description = "业务实体名称") private String company; - @Schema(description = "描述", example = "随便") + @Schema(description = "描述", example = "你猜") private String remark; @Schema(description = "创建日期") diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyRespVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyRespVO.java index 5d2280bd..0e9f2e49 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyRespVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyRespVO.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @ToString(callSuper = true) public class BorrowApplyRespVO extends BorrowApplyBaseVO { - @Schema(description = "借阅id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8595") + @Schema(description = "借阅id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2504") private Long id; @Schema(description = "创建日期") diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyUpdateReqVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyUpdateReqVO.java index 89f245ba..9849e45b 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyUpdateReqVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyUpdateReqVO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.*; @ToString(callSuper = true) public class BorrowApplyUpdateReqVO extends BorrowApplyBaseVO { - @Schema(description = "借阅id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8595") + @Schema(description = "借阅id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2504") @NotNull(message = "借阅id不能为空") private Long id; diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/authenticate/AuthenticateDO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/authenticate/AuthenticateDO.java index fa22b5fb..00e648af 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/authenticate/AuthenticateDO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/authenticate/AuthenticateDO.java @@ -86,4 +86,9 @@ public class AuthenticateDO extends BaseDO { */ private String remark; + /** + * 鉴定结果 + */ + private String result; + } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/borrowapply/BorrowApplyDO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/borrowapply/BorrowApplyDO.java index 7897b0ea..c7e51190 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/borrowapply/BorrowApplyDO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/borrowapply/BorrowApplyDO.java @@ -43,7 +43,7 @@ public class BorrowApplyDO extends BaseDO { /** * 借阅描述 */ - private String describe; + private String describes; /** * 借阅人id */ diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/authenticate/AuthenticateMapper.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/authenticate/AuthenticateMapper.java index e7032afa..a2c799b6 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/authenticate/AuthenticateMapper.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/authenticate/AuthenticateMapper.java @@ -34,6 +34,7 @@ public interface AuthenticateMapper extends BaseMapperX { .eqIfPresent(AuthenticateDO::getCompanyId, reqVO.getCompanyId()) .eqIfPresent(AuthenticateDO::getCompany, reqVO.getCompany()) .eqIfPresent(AuthenticateDO::getRemark, reqVO.getRemark()) + .eqIfPresent(AuthenticateDO::getResult, reqVO.getResult()) .orderByDesc(AuthenticateDO::getId)); } @@ -54,6 +55,7 @@ public interface AuthenticateMapper extends BaseMapperX { .eqIfPresent(AuthenticateDO::getCompanyId, reqVO.getCompanyId()) .eqIfPresent(AuthenticateDO::getCompany, reqVO.getCompany()) .eqIfPresent(AuthenticateDO::getRemark, reqVO.getRemark()) + .eqIfPresent(AuthenticateDO::getResult, reqVO.getResult()) .orderByDesc(AuthenticateDO::getId)); } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/borrowapply/BorrowApplyMapper.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/borrowapply/BorrowApplyMapper.java index c8c194d3..1f0db30c 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/borrowapply/BorrowApplyMapper.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/borrowapply/BorrowApplyMapper.java @@ -22,7 +22,7 @@ public interface BorrowApplyMapper extends BaseMapperX { .eqIfPresent(BorrowApplyDO::getBorrowCode, reqVO.getBorrowCode()) .eqIfPresent(BorrowApplyDO::getBorrowState, reqVO.getBorrowState()) .eqIfPresent(BorrowApplyDO::getReason, reqVO.getReason()) - .eqIfPresent(BorrowApplyDO::getDescribe, reqVO.getDescribe()) + .eqIfPresent(BorrowApplyDO::getDescribes, reqVO.getDescribes()) .eqIfPresent(BorrowApplyDO::getUserId, reqVO.getUserId()) .likeIfPresent(BorrowApplyDO::getUserName, reqVO.getUserName()) .eqIfPresent(BorrowApplyDO::getDeptId, reqVO.getDeptId()) @@ -42,7 +42,7 @@ public interface BorrowApplyMapper extends BaseMapperX { .eqIfPresent(BorrowApplyDO::getBorrowCode, reqVO.getBorrowCode()) .eqIfPresent(BorrowApplyDO::getBorrowState, reqVO.getBorrowState()) .eqIfPresent(BorrowApplyDO::getReason, reqVO.getReason()) - .eqIfPresent(BorrowApplyDO::getDescribe, reqVO.getDescribe()) + .eqIfPresent(BorrowApplyDO::getDescribes, reqVO.getDescribes()) .eqIfPresent(BorrowApplyDO::getUserId, reqVO.getUserId()) .likeIfPresent(BorrowApplyDO::getUserName, reqVO.getUserName()) .eqIfPresent(BorrowApplyDO::getDeptId, reqVO.getDeptId()) diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/borrowapply/BorrowApplyServiceImpl.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/borrowapply/BorrowApplyServiceImpl.java index 2251fe5b..ce17b670 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/borrowapply/BorrowApplyServiceImpl.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/borrowapply/BorrowApplyServiceImpl.java @@ -1,9 +1,11 @@ package cn.iocoder.yudao.module.archives.service.borrowapply; +import cn.hutool.core.date.LocalDateTimeUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; +import java.time.LocalDateTime; import java.util.*; import cn.iocoder.yudao.module.archives.controller.admin.borrowapply.vo.*; import cn.iocoder.yudao.module.archives.dal.dataobject.borrowapply.BorrowApplyDO; diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/resources/mapper/borrowapply/BorrowApplyMapper.xml b/yudao-module-archives/yudao-module-archives-biz/src/main/resources/mapper/borrowapply/BorrowApplyMapper.xml deleted file mode 100644 index 468705e1..00000000 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/resources/mapper/borrowapply/BorrowApplyMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - -