From eaa1d23ac26ee14485b3712413de682eddcb7a51 Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Thu, 26 Oct 2023 17:05:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=89=B4=E5=AE=9A=E6=96=B0=E5=A2=9E=E5=85=A8?= =?UTF-8?q?=E5=AE=97=E5=8F=B7=20=E7=9B=AE=E5=BD=95=E5=8F=B7=20=E6=A1=88?= =?UTF-8?q?=E5=8D=B7=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/{202310119JS.sql => 20231019JS.sql} | 0 sql/20231026JS.sql | 7 +++++++ .../admin/authenticate/vo/AuthenticateBaseVO.java | 9 +++++++++ .../admin/authenticate/vo/AuthenticateExcelVO.java | 9 +++++++++ .../authenticate/vo/AuthenticateExportReqVO.java | 9 +++++++++ .../authenticate/vo/AuthenticatePageReqVO.java | 9 +++++++++ .../dataobject/authenticate/AuthenticateDO.java | 14 ++++++++++++++ .../authenticate/AuthenticateServiceImpl.java | 7 ++++--- .../archives/service/record/RecordServiceImpl.java | 4 ++-- 9 files changed, 63 insertions(+), 5 deletions(-) rename sql/{202310119JS.sql => 20231019JS.sql} (100%) create mode 100644 sql/20231026JS.sql diff --git a/sql/202310119JS.sql b/sql/20231019JS.sql similarity index 100% rename from sql/202310119JS.sql rename to sql/20231019JS.sql diff --git a/sql/20231026JS.sql b/sql/20231026JS.sql new file mode 100644 index 00000000..0d309dd3 --- /dev/null +++ b/sql/20231026JS.sql @@ -0,0 +1,7 @@ + +-- 档案鉴定表 新增 全宗号 目录号 案卷号 字段 +ALTER TABLE archives_authenticate ADD COLUMN `case_num` varchar(255) NULL DEFAULT NULL COMMENT '全宗号'; + +ALTER TABLE archives_authenticate ADD COLUMN `catalog_num` varchar(255) NULL DEFAULT NULL COMMENT '目录号'; + +ALTER TABLE archives_authenticate ADD COLUMN `files_num` varchar(255) NULL DEFAULT NULL COMMENT '案卷号'; diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateBaseVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateBaseVO.java index 2145198f..b2de35c3 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateBaseVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateBaseVO.java @@ -65,4 +65,13 @@ public class AuthenticateBaseVO { @Schema(description = "鉴定结果", example = "鉴定结果") private String result; + @Schema(description = "全宗号", example = "全宗号") + private String caseNum; + + @Schema(description = "目录号", example = "目录号") + private String catalogNum; + + @Schema(description = "案卷号", example = "案卷号") + private String filesNum; + } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExcelVO.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExcelVO.java index 0361e40e..9502023b 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExcelVO.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExcelVO.java @@ -69,4 +69,13 @@ public class AuthenticateExcelVO { @ExcelProperty("鉴定结果") private String result; + @ExcelProperty("全宗号") + private String caseNum; + + @ExcelProperty("目录号") + private String catalogNum; + + @ExcelProperty("案卷号") + private String filesNum; + } 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 7daaf7d6..b0ef4c85 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 @@ -63,4 +63,13 @@ public class AuthenticateExportReqVO { @Schema(description = "鉴定结果",example = "鉴定结果") private String result; + @Schema(description = "全宗号", example = "全宗号") + private String caseNum; + + @Schema(description = "目录号", example = "目录号") + private String catalogNum; + + @Schema(description = "案卷号", example = "案卷号") + private String filesNum; + } 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 1e396ba6..289d4b3d 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 @@ -65,4 +65,13 @@ public class AuthenticatePageReqVO extends PageParam { @Schema(description = "鉴定结果",example = "鉴定结果") private String result; + @Schema(description = "全宗号", example = "全宗号") + private String caseNum; + + @Schema(description = "目录号", example = "目录号") + private String catalogNum; + + @Schema(description = "案卷号", example = "案卷号") + private String filesNum; + } 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 a6dfe8ab..218106ac 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 @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.archives.dal.dataobject.authenticate; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -91,4 +92,17 @@ public class AuthenticateDO extends BaseDO { */ private String result; + /** + * 全宗号 + */ + private String caseNum; + /** + * 目录号 + */ + private String catalogNum; + /** + * 案卷号 + */ + private String filesNum; + } diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/authenticate/AuthenticateServiceImpl.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/authenticate/AuthenticateServiceImpl.java index 65ab8f63..92c4eb4d 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/authenticate/AuthenticateServiceImpl.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/authenticate/AuthenticateServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.druid.sql.visitor.functions.Now; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import org.apache.poi.hssf.record.Record; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -107,9 +108,9 @@ public class AuthenticateServiceImpl implements AuthenticateService { record.setIdentifyStatus("1"); recordMapper.updateById(record); - //设置档案类型和档案位置 - vo.setType(record.getFileType()); - vo.setPosition(record.getSite()); + //设置档案基础信息到鉴定历史中 + BeanUtils.copyProperties(record,vo); + vo.setPosition(record.getSite()).setType(record.getFileType()); AuthenticateDO authenticate = AuthenticateConvert.INSTANCE.convert(vo); authenticate.setDate(LocalDateTime.now()); //新增鉴定申请记录 diff --git a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java index c87cb42b..4a0d64a6 100644 --- a/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java +++ b/yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/record/RecordServiceImpl.java @@ -203,10 +203,10 @@ public class RecordServiceImpl implements RecordService { @Override public PageResult getRecordPage(RecordPageReqVO pageReqVO) { // 这里加入authenticate字段区分是归档台账的调用接口还是鉴定调用接口 鉴定接口只查询未鉴定的归档台账 - if (StringUtils.isNotNull(pageReqVO.getAuthenticate())){ + if (StringUtils.isNotNull(pageReqVO.getAuthenticate())){//查询列表 return recordMapper.selectPageAuthenticate(pageReqVO); } - return recordMapper.selectPage(pageReqVO); + return recordMapper.selectPage(pageReqVO);//查询历史 } @Override