立档单位-库房-档案柜

new
JilingLee 1 year ago
parent 0690beddb2
commit 20eaeb9f51

@ -37,6 +37,9 @@ CREATE TABLE `archives_record` (
`updater` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`user_id` bigint(20) NULL DEFAULT NULL COMMENT 'id',
`create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`organization_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`depot_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`cabinet_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 27 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '' ROW_FORMAT = Dynamic;

@ -0,0 +1,122 @@
-- ----------------------------
-- setting_organization
-- ----------------------------
DROP TABLE IF EXISTS `setting_organization`;
CREATE TABLE `setting_organization` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
`organization_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`organization_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`case_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`attr1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1',
`attr2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '2',
`attr3` int(11) NULL DEFAULT NULL COMMENT '3',
`attr4` int(11) NULL DEFAULT NULL COMMENT '4',
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '',
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '',
`dept_id` bigint(20) NULL DEFAULT NULL COMMENT 'id',
`dept_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`user_id` bigint(20) NULL DEFAULT NULL COMMENT 'id',
`deleted` bit(1) NULL DEFAULT b'0' COMMENT '',
`company_id` bigint(20) NULL DEFAULT NULL COMMENT 'id',
`company` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`tenant_id` bigint(20) NOT NULL COMMENT '/',
`create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '' ROW_FORMAT = Dynamic;
-- ----------------------------
-- for setting_depot
-- ----------------------------
DROP TABLE IF EXISTS `setting_depot`;
CREATE TABLE `setting_depot` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`organization_id` bigint(20) NULL DEFAULT NULL COMMENT 'id',
`maneger_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '',
`maneger_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '',
`dept_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`dept_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`company_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`company` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`user_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`deleted` bit(1) NULL DEFAULT b'0' COMMENT '',
`tenant_id` bigint(20) NOT NULL COMMENT '',
`attr1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1',
`attr2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '2',
`attr3` int(11) NULL DEFAULT NULL COMMENT '3',
`attr4` int(11) NULL DEFAULT NULL COMMENT '4',
`organization_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`organization_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '' ROW_FORMAT = Dynamic;
-- ----------------------------
-- for setting_depot_cabinet
-- ----------------------------
DROP TABLE IF EXISTS `setting_depot_cabinet`;
CREATE TABLE `setting_depot_cabinet` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`depot_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`maneger_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '',
`maneger_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '',
`dept_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`dept_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`company_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`company` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`user_id` bigint(20) NULL DEFAULT NULL COMMENT 'ID',
`deleted` bit(1) NULL DEFAULT b'0' COMMENT '',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '',
`tenant_id` bigint(20) NOT NULL COMMENT '',
`attr1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1',
`attr2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '2',
`attr3` int(11) NULL DEFAULT NULL COMMENT '3',
`attr4` int(11) NULL DEFAULT NULL COMMENT '4',
`cabinet_num` int(11) NULL DEFAULT NULL COMMENT '',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 11 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, 2, 0, '/setting', 'config', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-09-11 09:50:15', '1', '2023-09-11 10:41:21', b'0');
-- ID
SET @menuId = 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 ('', '', 2, 0, @menuId, 'organization', '', 'setting/organization/index', 'Organization', 0, b'1', b'1', b'1', '', '2023-09-11 10:39:56', '', '2023-09-11 10:39:56', b'0');
-- ID
SET @menuId2 = LAST_INSERT_ID();
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:organization:query', 3, 1, @menuId2, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-11 10:39:56', '', '2023-09-11 10:39:56', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:organization:create', 3, 2, @menuId2, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-11 10:39:56', '', '2023-09-11 10:39:56', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:organization:update', 3, 3, @menuId2, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-11 10:39:56', '', '2023-09-11 10:39:56', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:organization:delete', 3, 4, @menuId2, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-11 10:39:56', '', '2023-09-11 10:39:56', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:organization:export', 3, 5, @menuId2, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-11 10:39:56', '', '2023-09-11 10:39:56', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', '', 2, 2, @menuId, 'depot-cabinet', '', 'setting/depotCabinet/index', 'DepotCabinet', 0, b'1', b'1', b'1', '', '2023-09-12 09:28:34', '1', '2023-09-12 09:33:27', b'0');
-- ID
SET @menuId3 = LAST_INSERT_ID();
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot-cabinet:query', 3, 1, @menuId3, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:34', '', '2023-09-12 09:28:34', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot-cabinet:create', 3, 2, @menuId3, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:34', '', '2023-09-12 09:28:34', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot-cabinet:update', 3, 3, @menuId3, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:34', '', '2023-09-12 09:28:34', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot-cabinet:delete', 3, 4, @menuId3, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:34', '', '2023-09-12 09:28:34', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot-cabinet:export', 3, 5, @menuId3, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:34', '', '2023-09-12 09:28:34', 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 ('', '', 2, 1, @menuId, 'depot', '', 'setting/depot/index', 'Depot', 0, b'1', b'1', b'1', '', '2023-09-12 09:28:44', '1', '2023-09-12 09:33:31', b'0');
-- ID
SET @menuId4 = LAST_INSERT_ID();
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot:query', 3, 1, @menuId4, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:44', '', '2023-09-12 09:28:44', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot:create', 3, 2, @menuId4, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:44', '', '2023-09-12 09:28:44', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot:update', 3, 3, @menuId4, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:44', '', '2023-09-12 09:28:44', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot:delete', 3, 4, @menuId4, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:44', '', '2023-09-12 09:28:44', b'0');
INSERT INTO `lyr-one`.`system_menu`(`id`, `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 (NULL, '', 'setting:depot:export', 3, 5, @menuId4, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-09-12 09:28:44', '', '2023-09-12 09:28:44', b'0');

@ -0,0 +1,23 @@
package cn.iocoder.yudao.module.archives.controller.admin.common;
/***
* @des
* @author Lee
* @date 2023/09/13
*/
public class CommonConstants {
/**
*-
*/
public static final String ARCHIVES_FILE_STATUS_START = "0";
/**
* -
*/
public static final String ARCHIVES_FILE_STATUS_FINISH = "1";
}

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.archives.controller.admin.record;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.module.archives.controller.admin.common.CommonConstants;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -52,6 +53,19 @@ public class RecordController {
return success(true);
}
@PutMapping("/record")
@Operation(summary = "批量归档归档")
@PreAuthorize("@ss.hasPermission('archives:record:update')")
public CommonResult<Boolean> record(@RequestParam("ids") Long[] ids) {
for(Long id : ids){
RecordUpdateReqVO updateReqVO = new RecordUpdateReqVO();
updateReqVO.setId(id);
updateReqVO.setFileStatus(CommonConstants.ARCHIVES_FILE_STATUS_FINISH);
recordService.updateRecord(updateReqVO);
}
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除归档")
@Parameter(name = "id", description = "编号", required = true)

@ -94,5 +94,12 @@ public class RecordBaseVO {
@Schema(description = "制单人", example = "王五")
private String createBy;
@Schema(description = "立档单位id")
private Long organizationId;
@Schema(description = "库房id")
private Long depotId;
@Schema(description = "档案柜id")
private Long cabinetId;
}

@ -103,4 +103,17 @@ public class RecordExcelVO {
@ExcelProperty("制单人")
private String createBy;
/**
*
*/
private Long organizationId;
/**
*
*/
private Long depotId;
/**
*
*/
private Long cabinetId;
}

@ -101,4 +101,17 @@ public class RecordPageReqVO extends PageParam {
@Schema(description = "制单人")
private String createBy;
/**
*
*/
private Long organizationId;
/**
*
*/
private Long depotId;
/**
*
*/
private Long cabinetId;
}

@ -14,5 +14,7 @@ public class RecordUpdateReqVO extends RecordBaseVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4837")
@NotNull(message = "主键不能为空")
private Long id;
@NotNull(message = "归档状态不能为空")
private String fileStatus;
}

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.archives.dal.dataobject.record;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
@ -137,4 +138,18 @@ public class RecordDO extends BaseDO {
private String createBy;
/**
*
*/
private Long organizationId;
/**
*
*/
private Long depotId;
/**
*
*/
private Long cabinetId;
}

@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissi
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.archives.controller.admin.common.CommonConstants;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
@ -60,6 +61,7 @@ public class RecordServiceImpl implements RecordService {
record.setCompany(deptDO.getName());
}
record.setCreateBy(adminUserDO.getNickname());
record.setFileStatus(CommonConstants.ARCHIVES_FILE_STATUS_START);
recordMapper.insert(record);
// 返回
return record.getId();

@ -49,5 +49,7 @@ public class DepotCabinetBaseVO {
@Schema(description = "备注", example = "你猜")
private String remark;
@Schema(description = "柜子数量", example = "22208")
private Integer cabinetNum;
}

@ -57,5 +57,7 @@ public class DepotCabinetExcelVO {
@ExcelProperty("备注")
private String remark;
@ExcelProperty("柜子数量")
private Integer cabinetNum;
}

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.setting.controller.admin.depotcabinet.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
@ -53,4 +54,7 @@ public class DepotCabinetExportReqVO {
@Schema(description = "备注", example = "你猜")
private String remark;
@Schema(description = "柜子数量", example = "22208")
private Integer cabinetNum;
}

@ -55,4 +55,7 @@ public class DepotCabinetPageReqVO extends PageParam {
@Schema(description = "备注", example = "你猜")
private String remark;
@Schema(description = "柜子数量", example = "22208")
private Integer cabinetNum;
}

@ -104,7 +104,6 @@ public class OrganizationController {
@GetMapping("/getTree")
@Operation(summary = "获得立档单位树")
@PreAuthorize("@ss.hasPermission('setting:organization:query')")
public CommonResult<List<OrganizationDepotVO>> getTree() {
return success(organizationService.getOrganizationTree());
}

@ -40,5 +40,6 @@ public class OrganizationBaseVO {
@Schema(description = "业务实体")
private String company;
@Schema(description = "制单人")
private String createBy;
}

@ -48,5 +48,7 @@ public class OrganizationExcelVO {
@ExcelProperty("业务实体")
private String company;
@ExcelProperty("制单人")
private String createBy;
}

@ -43,5 +43,7 @@ public class OrganizationExportReqVO {
@Schema(description = "业务实体")
private String company;
@Schema(description = "制单人")
private String createBy;
}

@ -45,5 +45,6 @@ public class OrganizationPageReqVO extends PageParam {
@Schema(description = "业务实体")
private String company;
@Schema(description = "制单人")
private String createBy;
}

@ -91,5 +91,9 @@ public class DepotCabinetDO extends BaseDO {
* 4
*/
private Integer attr4;
/**
*
*/
private Integer cabinetNum;
}

@ -79,5 +79,9 @@ public class OrganizationDO extends BaseDO {
*
*/
private String company;
/**
*
*/
private String createBy;
}

@ -46,6 +46,7 @@ public class OrganizationServiceImpl implements OrganizationService {
AdminUserDO adminUserDO = userMapper.selectById(loginUser.getId());
//添加数据部门id后续DataPermissionConfigurationRecord配置类中过滤数据
organization.setDeptId(adminUserDO.getDeptId());
organization.setCreateBy(adminUserDO.getNickname());
organizationMapper.insert(organization);
// 返回
return organization.getId();

@ -45,13 +45,13 @@ spring:
datasource:
master:
name: ruoyi-vue-pro
url: jdbc:mysql://139.224.253.31:3308/lyr-one?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/lyr-one?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
username: root
password: abc123456.
password: root
# username: sa
# password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
# slave: # 模拟从库,可根据自己需要修改
@ -226,3 +226,12 @@ justauth:
prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
#mybatis-plus配置控制台打印完整带参数SQL语句
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#Flowable相关配置
flowable:
async-executor-activate: false #关闭定时任务JOB
# 将databaseSchemaUpdate设置为true。当Flowable发现库与数据库表结构不一致时会自动将数据库表结构升级至新版本。

Loading…
Cancel
Save