Js
/
lyr-one-test
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

借阅申请修改

Browse Source
new
LAPTOP-0SF788NU\admin 1 year ago
parent 6babc07765
commit 9c8eaf7a4b
16 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File

45
sql/borrow_apply20230913JS.sql
Unescape Escape View File

@ -1,27 +1,28 @@
-- 新增 借阅申请表 -- 新增 借阅申请表
CREATE TABLE `lyr-one`.`archives_borrow_apply` ( CREATE TABLE `lyr-one`.`archives_borrow_apply` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '借阅id', `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_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驳回', `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 '借阅事由', `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 '借阅描述', `describes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅描述',
`user_id` bigint(20) NULL DEFAULT NULL COMMENT '借阅人id', `user_id` bigint(20) NULL DEFAULT NULL COMMENT '借阅人id',
`user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅人名称', `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_id` bigint(11) NULL DEFAULT NULL COMMENT '借阅部门id',
`dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅部门名称', `dept_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '借阅部门名称',
`return_time` datetime 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:现场查阅', `way` varchar(10) 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 '档案介质', `media` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '档案介质',
`company_id` bigint(20) NULL DEFAULT NULL COMMENT '业务实体id', `company_id` bigint(20) NULL DEFAULT NULL COMMENT '业务实体id',
`company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务实体名称', `company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务实体名称',
`tenant_id` bigint(20) 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 '描述', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期', `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
`update_time` datetime NULL DEFAULT NULL COMMENT '修改日期', `update_time` datetime NULL DEFAULT NULL COMMENT '修改日期',
`deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除', `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
PRIMARY KEY (`id`) USING BTREE `creator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
) ENGINE = MyISAM AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档案借阅申请表' ROW_FORMAT = Dynamic; `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'); 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(); SET @menuId = LAST_INSERT_ID();

2
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/AuthenticateController.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class AuthenticateController {
* @param recordPageReqVO * @param recordPageReqVO
* @return * @return
*/ */
@GetMapping("/get") @GetMapping("/get/record")
@Operation(summary = "获得档案鉴定列表") @Operation(summary = "获得档案鉴定列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('archives:authenticate:query')") @PreAuthorize("@ss.hasPermission('archives:authenticate:query')")

3
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExportReqVO.java
Unescape Escape View File

@ -60,4 +60,7 @@ public class AuthenticateExportReqVO {
@Schema(description = "备注", example = "你猜") @Schema(description = "备注", example = "你猜")
private String remark; private String remark;
@Schema(description = "鉴定结果",example = "鉴定结果")
private String result;
} }

3
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticatePageReqVO.java
Unescape Escape View File

@ -62,4 +62,7 @@ public class AuthenticatePageReqVO extends PageParam {
@Schema(description = "备注", example = "你猜") @Schema(description = "备注", example = "你猜")
private String remark; private String remark;
@Schema(description = "鉴定结果",example = "鉴定结果")
private String result;
} }

16
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyBaseVO.java
Unescape Escape View File

@ -24,22 +24,22 @@ public class BorrowApplyBaseVO {
@Schema(description = "借阅申请状态 0:已通过 1驳回") @Schema(description = "借阅申请状态 0:已通过 1驳回")
private String borrowState; private String borrowState;
@Schema(description = "借阅事由", example = "不好") @Schema(description = "借阅事由", example = "不香")
private String reason; private String reason;
@Schema(description = "借阅描述") @Schema(description = "借阅描述")
private String describe; private String describes;
@Schema(description = "借阅人id", example = "6652") @Schema(description = "借阅人id", example = "30243")
private Long userId; private Long userId;
@Schema(description = "借阅人名称", example = "李四") @Schema(description = "借阅人名称", example = "赵六")
private String userName; private String userName;
@Schema(description = "借阅部门id", example = "29611") @Schema(description = "借阅部门id", example = "17160")
private Long deptId; private Long deptId;
@Schema(description = "借阅部门名称", example = "张三") @Schema(description = "借阅部门名称", example = "李四")
private String deptName; private String deptName;
@Schema(description = "预计归还日期") @Schema(description = "预计归还日期")
@ -52,13 +52,13 @@ public class BorrowApplyBaseVO {
@Schema(description = "档案介质") @Schema(description = "档案介质")
private String media; private String media;
@Schema(description = "业务实体id", example = "23211") @Schema(description = "业务实体id", example = "7747")
private Long companyId; private Long companyId;
@Schema(description = "业务实体名称") @Schema(description = "业务实体名称")
private String company; private String company;
@Schema(description = "描述", example = "随便") @Schema(description = "描述", example = "你猜")
private String remark; private String remark;
} }

2
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExcelVO.java
Unescape Escape View File

@ -30,7 +30,7 @@ public class BorrowApplyExcelVO {
private String reason; private String reason;
@ExcelProperty("借阅描述") @ExcelProperty("借阅描述")
private String describe; private String describes;
@ExcelProperty("借阅人id") @ExcelProperty("借阅人id")
private Long userId; private Long userId;

16
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyExportReqVO.java
Unescape Escape View File

@ -19,22 +19,22 @@ public class BorrowApplyExportReqVO {
@Schema(description = "借阅申请状态 0:已通过 1驳回") @Schema(description = "借阅申请状态 0:已通过 1驳回")
private String borrowState; private String borrowState;
@Schema(description = "借阅事由", example = "不好") @Schema(description = "借阅事由", example = "不香")
private String reason; private String reason;
@Schema(description = "借阅描述") @Schema(description = "借阅描述")
private String describe; private String describes;
@Schema(description = "借阅人id", example = "6652") @Schema(description = "借阅人id", example = "30243")
private Long userId; private Long userId;
@Schema(description = "借阅人名称", example = "李四") @Schema(description = "借阅人名称", example = "赵六")
private String userName; private String userName;
@Schema(description = "借阅部门id", example = "29611") @Schema(description = "借阅部门id", example = "17160")
private Long deptId; private Long deptId;
@Schema(description = "借阅部门名称", example = "张三") @Schema(description = "借阅部门名称", example = "李四")
private String deptName; private String deptName;
@Schema(description = "预计归还日期") @Schema(description = "预计归还日期")
@ -47,13 +47,13 @@ public class BorrowApplyExportReqVO {
@Schema(description = "档案介质") @Schema(description = "档案介质")
private String media; private String media;
@Schema(description = "业务实体id", example = "23211") @Schema(description = "业务实体id", example = "7747")
private Long companyId; private Long companyId;
@Schema(description = "业务实体名称") @Schema(description = "业务实体名称")
private String company; private String company;
@Schema(description = "描述", example = "随便") @Schema(description = "描述", example = "你猜")
private String remark; private String remark;
@Schema(description = "创建日期") @Schema(description = "创建日期")

16
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyPageReqVO.java
Unescape Escape View File

@ -21,22 +21,22 @@ public class BorrowApplyPageReqVO extends PageParam {
@Schema(description = "借阅申请状态 0:已通过 1驳回") @Schema(description = "借阅申请状态 0:已通过 1驳回")
private String borrowState; private String borrowState;
@Schema(description = "借阅事由", example = "不好") @Schema(description = "借阅事由", example = "不香")
private String reason; private String reason;
@Schema(description = "借阅描述") @Schema(description = "借阅描述")
private String describe; private String describes;
@Schema(description = "借阅人id", example = "6652") @Schema(description = "借阅人id", example = "30243")
private Long userId; private Long userId;
@Schema(description = "借阅人名称", example = "李四") @Schema(description = "借阅人名称", example = "赵六")
private String userName; private String userName;
@Schema(description = "借阅部门id", example = "29611") @Schema(description = "借阅部门id", example = "17160")
private Long deptId; private Long deptId;
@Schema(description = "借阅部门名称", example = "张三") @Schema(description = "借阅部门名称", example = "李四")
private String deptName; private String deptName;
@Schema(description = "预计归还日期") @Schema(description = "预计归还日期")
@ -49,13 +49,13 @@ public class BorrowApplyPageReqVO extends PageParam {
@Schema(description = "档案介质") @Schema(description = "档案介质")
private String media; private String media;
@Schema(description = "业务实体id", example = "23211") @Schema(description = "业务实体id", example = "7747")
private Long companyId; private Long companyId;
@Schema(description = "业务实体名称") @Schema(description = "业务实体名称")
private String company; private String company;
@Schema(description = "描述", example = "随便") @Schema(description = "描述", example = "你猜")
private String remark; private String remark;
@Schema(description = "创建日期") @Schema(description = "创建日期")

2
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyRespVO.java
Unescape Escape View File

@ -10,7 +10,7 @@ import java.time.LocalDateTime;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BorrowApplyRespVO extends BorrowApplyBaseVO { 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; private Long id;
@Schema(description = "创建日期") @Schema(description = "创建日期")

2
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/borrowapply/vo/BorrowApplyUpdateReqVO.java
Unescape Escape View File

@ -11,7 +11,7 @@ import javax.validation.constraints.*;
@ToString(callSuper = true) @ToString(callSuper = true)
public class BorrowApplyUpdateReqVO extends BorrowApplyBaseVO { 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不能为空") @NotNull(message = "借阅id不能为空")
private Long id; private Long id;

5
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/authenticate/AuthenticateDO.java
Unescape Escape View File

@ -86,4 +86,9 @@ public class AuthenticateDO extends BaseDO {
*/ */
private String remark; private String remark;
/**
* 鉴定结果
*/
private String result;
} }

2
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/borrowapply/BorrowApplyDO.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class BorrowApplyDO extends BaseDO {
/** /**
* 借阅描述 * 借阅描述
*/ */
private String describe; private String describes;
/** /**
* 借阅人id * 借阅人id
*/ */

2
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/authenticate/AuthenticateMapper.java
Unescape Escape View File

@ -34,6 +34,7 @@ public interface AuthenticateMapper extends BaseMapperX<AuthenticateDO> {
.eqIfPresent(AuthenticateDO::getCompanyId, reqVO.getCompanyId()) .eqIfPresent(AuthenticateDO::getCompanyId, reqVO.getCompanyId())
.eqIfPresent(AuthenticateDO::getCompany, reqVO.getCompany()) .eqIfPresent(AuthenticateDO::getCompany, reqVO.getCompany())
.eqIfPresent(AuthenticateDO::getRemark, reqVO.getRemark()) .eqIfPresent(AuthenticateDO::getRemark, reqVO.getRemark())
.eqIfPresent(AuthenticateDO::getResult, reqVO.getResult())
.orderByDesc(AuthenticateDO::getId)); .orderByDesc(AuthenticateDO::getId));
} }
@ -54,6 +55,7 @@ public interface AuthenticateMapper extends BaseMapperX<AuthenticateDO> {
.eqIfPresent(AuthenticateDO::getCompanyId, reqVO.getCompanyId()) .eqIfPresent(AuthenticateDO::getCompanyId, reqVO.getCompanyId())
.eqIfPresent(AuthenticateDO::getCompany, reqVO.getCompany()) .eqIfPresent(AuthenticateDO::getCompany, reqVO.getCompany())
.eqIfPresent(AuthenticateDO::getRemark, reqVO.getRemark()) .eqIfPresent(AuthenticateDO::getRemark, reqVO.getRemark())
.eqIfPresent(AuthenticateDO::getResult, reqVO.getResult())
.orderByDesc(AuthenticateDO::getId)); .orderByDesc(AuthenticateDO::getId));
} }

4
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/borrowapply/BorrowApplyMapper.java
Unescape Escape View File

@ -22,7 +22,7 @@ public interface BorrowApplyMapper extends BaseMapperX<BorrowApplyDO> {
.eqIfPresent(BorrowApplyDO::getBorrowCode, reqVO.getBorrowCode()) .eqIfPresent(BorrowApplyDO::getBorrowCode, reqVO.getBorrowCode())
.eqIfPresent(BorrowApplyDO::getBorrowState, reqVO.getBorrowState()) .eqIfPresent(BorrowApplyDO::getBorrowState, reqVO.getBorrowState())
.eqIfPresent(BorrowApplyDO::getReason, reqVO.getReason()) .eqIfPresent(BorrowApplyDO::getReason, reqVO.getReason())
.eqIfPresent(BorrowApplyDO::getDescribe, reqVO.getDescribe()) .eqIfPresent(BorrowApplyDO::getDescribes, reqVO.getDescribes())
.eqIfPresent(BorrowApplyDO::getUserId, reqVO.getUserId()) .eqIfPresent(BorrowApplyDO::getUserId, reqVO.getUserId())
.likeIfPresent(BorrowApplyDO::getUserName, reqVO.getUserName()) .likeIfPresent(BorrowApplyDO::getUserName, reqVO.getUserName())
.eqIfPresent(BorrowApplyDO::getDeptId, reqVO.getDeptId()) .eqIfPresent(BorrowApplyDO::getDeptId, reqVO.getDeptId())
@ -42,7 +42,7 @@ public interface BorrowApplyMapper extends BaseMapperX<BorrowApplyDO> {
.eqIfPresent(BorrowApplyDO::getBorrowCode, reqVO.getBorrowCode()) .eqIfPresent(BorrowApplyDO::getBorrowCode, reqVO.getBorrowCode())
.eqIfPresent(BorrowApplyDO::getBorrowState, reqVO.getBorrowState()) .eqIfPresent(BorrowApplyDO::getBorrowState, reqVO.getBorrowState())
.eqIfPresent(BorrowApplyDO::getReason, reqVO.getReason()) .eqIfPresent(BorrowApplyDO::getReason, reqVO.getReason())
.eqIfPresent(BorrowApplyDO::getDescribe, reqVO.getDescribe()) .eqIfPresent(BorrowApplyDO::getDescribes, reqVO.getDescribes())
.eqIfPresent(BorrowApplyDO::getUserId, reqVO.getUserId()) .eqIfPresent(BorrowApplyDO::getUserId, reqVO.getUserId())
.likeIfPresent(BorrowApplyDO::getUserName, reqVO.getUserName()) .likeIfPresent(BorrowApplyDO::getUserName, reqVO.getUserName())
.eqIfPresent(BorrowApplyDO::getDeptId, reqVO.getDeptId()) .eqIfPresent(BorrowApplyDO::getDeptId, reqVO.getDeptId())

2
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/borrowapply/BorrowApplyServiceImpl.java
Unescape Escape View File

@ -1,9 +1,11 @@
package cn.iocoder.yudao.module.archives.service.borrowapply; package cn.iocoder.yudao.module.archives.service.borrowapply;
import cn.hutool.core.date.LocalDateTimeUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import cn.iocoder.yudao.module.archives.controller.admin.borrowapply.vo.*; import cn.iocoder.yudao.module.archives.controller.admin.borrowapply.vo.*;
import cn.iocoder.yudao.module.archives.dal.dataobject.borrowapply.BorrowApplyDO; import cn.iocoder.yudao.module.archives.dal.dataobject.borrowapply.BorrowApplyDO;

12
yudao-module-archives/yudao-module-archives-biz/src/main/resources/mapper/borrowapply/BorrowApplyMapper.xml
Unescape Escape View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.archives.dal.mysql.borrowapply.BorrowApplyMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>
Write Preview
Loading…
Cancel
Save