Merge remote-tracking branch 'origin/main'

sql/20231108cyl.sql

@@ -0,0 +1 @@
+UPDATE `lyr-one`.`system_dict_data` SET `sort` = 2, `label` = '女', `value` = '2', `dict_type` = 'system_user_sex', `status` = 0, `color_type` = 'default', `css_class` = '', `remark` = '性别女', `creator` = 'admin', `create_time` = '2021-01-05 17:03:48', `updater` = '1', `update_time` = '2023-11-08 11:00:02', `deleted` = b'0' WHERE `id` = 2;

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/turnover/vo/TurnOverBaseVO.java

@@ -28,28 +28,28 @@ public class TurnOverBaseVO {
     @Schema(description = "移交说明")
     private String turnExplain;
 
-    @Schema(description = "移交人", example = "张三")
+    @Schema(description = "移交人", example = "赵六")
     private String outputName;
 
-    @Schema(description = "移交人ID", example = "24105")
+    @Schema(description = "移交人ID", example = "7955")
     private Long outputNameId;
 
-    @Schema(description = "签收人", example = "李四")
+    @Schema(description = "签收人", example = "张三")
     private String inputName;
 
-    @Schema(description = "签收人ID", example = "28017")
+    @Schema(description = "签收人ID", example = "6837")
     private Long inputNameId;
 
-    @Schema(description = "用户ID", example = "23669")
+    @Schema(description = "用户ID", example = "24443")
     private Long userId;
 
-    @Schema(description = "所属部门ID", example = "27304")
+    @Schema(description = "所属部门ID", example = "25757")
     private Long deptId;
 
-    @Schema(description = "所属部门", example = "张三")
+    @Schema(description = "所属部门", example = "李四")
     private String deptName;
 
-    @Schema(description = "业务实体ID", example = "13936")
+    @Schema(description = "业务实体ID", example = "25148")
     private Long companyId;
 
     @Schema(description = "业务实体")
@@ -61,22 +61,22 @@ public class TurnOverBaseVO {
     @Schema(description = "制单人")
     private String createBy;
 
-    @Schema(description = "从立档单位ID", example = "12461")
+    @Schema(description = "从立档单位ID", example = "25803")
     private Long fromOrganizationId;
 
-    @Schema(description = "从库房ID", example = "31262")
+    @Schema(description = "从库房ID", example = "10413")
     private Long fromDepotId;
 
-    @Schema(description = "从档案柜ID", example = "19367")
+    @Schema(description = "从档案柜ID", example = "12668")
     private Long fromCabinetId;
 
-    @Schema(description = "到立档单位ID", example = "18409")
+    @Schema(description = "到立档单位ID", example = "8930")
     private Long toOrganizationId;
 
-    @Schema(description = "到库房ID", example = "17779")
+    @Schema(description = "到库房ID", example = "30801")
     private Long toDepotId;
 
-    @Schema(description = "到档案柜ID", example = "24097")
+    @Schema(description = "到档案柜ID", example = "1470")
     private Long toCabinetId;
 
     @Schema(description = "制单人id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24299")
@@ -106,4 +106,7 @@ public class TurnOverBaseVO {
     @Schema(description = "文件大小")
     private String fileSize;
 
+    @Schema(description = "文件名", example = "李四")
+    private String fileName;
+
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/turnover/vo/TurnOverExcelVO.java

@@ -1,13 +1,9 @@
 package cn.iocoder.yudao.module.archives.controller.admin.turnover.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-
 import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 /**
  * 移交 Excel VO
@@ -109,4 +105,7 @@ public class TurnOverExcelVO {
 
     @ExcelProperty("文件大小")
     private String fileSize;
+
+    @ExcelProperty("文件名")
+    private String fileName;
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/turnover/vo/TurnOverExportReqVO.java

@@ -23,28 +23,28 @@ public class TurnOverExportReqVO {
     @Schema(description = "移交说明")
     private String turnExplain;
 
-    @Schema(description = "移交人", example = "张三")
+    @Schema(description = "移交人", example = "赵六")
     private String outputName;
 
-    @Schema(description = "移交人ID", example = "24105")
+    @Schema(description = "移交人ID", example = "7955")
     private Long outputNameId;
 
-    @Schema(description = "签收人", example = "李四")
+    @Schema(description = "签收人", example = "张三")
     private String inputName;
 
-    @Schema(description = "签收人ID", example = "28017")
+    @Schema(description = "签收人ID", example = "6837")
     private Long inputNameId;
 
-    @Schema(description = "用户ID", example = "23669")
+    @Schema(description = "用户ID", example = "24443")
     private Long userId;
 
-    @Schema(description = "所属部门ID", example = "27304")
+    @Schema(description = "所属部门ID", example = "25757")
     private Long deptId;
 
-    @Schema(description = "所属部门", example = "张三")
+    @Schema(description = "所属部门", example = "李四")
     private String deptName;
 
-    @Schema(description = "业务实体ID", example = "13936")
+    @Schema(description = "业务实体ID", example = "25148")
     private Long companyId;
 
     @Schema(description = "业务实体")
@@ -56,25 +56,25 @@ public class TurnOverExportReqVO {
     @Schema(description = "制单人")
     private String createBy;
 
-    @Schema(description = "从立档单位ID", example = "12461")
+    @Schema(description = "从立档单位ID", example = "25803")
     private Long fromOrganizationId;
 
-    @Schema(description = "从库房ID", example = "31262")
+    @Schema(description = "从库房ID", example = "10413")
     private Long fromDepotId;
 
-    @Schema(description = "从档案柜ID", example = "19367")
+    @Schema(description = "从档案柜ID", example = "12668")
     private Long fromCabinetId;
 
-    @Schema(description = "到立档单位ID", example = "18409")
+    @Schema(description = "到立档单位ID", example = "8930")
     private Long toOrganizationId;
 
-    @Schema(description = "到库房ID", example = "17779")
+    @Schema(description = "到库房ID", example = "30801")
     private Long toDepotId;
 
-    @Schema(description = "到档案柜ID", example = "24097")
+    @Schema(description = "到档案柜ID", example = "1470")
     private Long toCabinetId;
 
-    @Schema(description = "制单人id", example = "24299")
+    @Schema(description = "制单人id", example = "21002")
     private Long createById;
 
     @Schema(description = "案卷数量")
@@ -84,25 +84,27 @@ public class TurnOverExportReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "流程实例的编号", example = "705")
+    @Schema(description = "流程实例的编号", example = "8680")
     private String processInstanceId;
 
     @Schema(description = "申请类型", example = "2")
     private String billType;
 
-    @Schema(description = "状态", example = "1")
+    @Schema(description = "状态", example = "2")
     private String status;
 
     @Schema(description = "旧档案位置")
     private String position;
 
-    @Schema(description = "鉴定历史记录id")
+    @Schema(description = "鉴定历史记录id", example = "28080")
     private Long authRecordId;
 
-
     @Schema(description = "文件地址", example = "https://www.iocoder.cn")
     private String fileUrl;
 
     @Schema(description = "文件大小")
     private String fileSize;
+
+    @Schema(description = "文件名", example = "李四")
+    private String fileName;
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/turnover/vo/TurnOverPageReqVO.java

@@ -25,28 +25,28 @@ public class TurnOverPageReqVO extends PageParam {
     @Schema(description = "移交说明")
     private String turnExplain;
 
-    @Schema(description = "移交人", example = "张三")
+    @Schema(description = "移交人", example = "赵六")
     private String outputName;
 
-    @Schema(description = "移交人ID", example = "24105")
+    @Schema(description = "移交人ID", example = "7955")
     private Long outputNameId;
 
-    @Schema(description = "签收人", example = "李四")
+    @Schema(description = "签收人", example = "张三")
     private String inputName;
 
-    @Schema(description = "签收人ID", example = "28017")
+    @Schema(description = "签收人ID", example = "6837")
     private Long inputNameId;
 
-    @Schema(description = "用户ID", example = "23669")
+    @Schema(description = "用户ID", example = "24443")
     private Long userId;
 
-    @Schema(description = "所属部门ID", example = "27304")
+    @Schema(description = "所属部门ID", example = "25757")
     private Long deptId;
 
-    @Schema(description = "所属部门", example = "张三")
+    @Schema(description = "所属部门", example = "李四")
     private String deptName;
 
-    @Schema(description = "业务实体ID", example = "13936")
+    @Schema(description = "业务实体ID", example = "25148")
     private Long companyId;
 
     @Schema(description = "业务实体")
@@ -58,25 +58,25 @@ public class TurnOverPageReqVO extends PageParam {
     @Schema(description = "制单人")
     private String createBy;
 
-    @Schema(description = "从立档单位ID", example = "12461")
+    @Schema(description = "从立档单位ID", example = "25803")
     private Long fromOrganizationId;
 
-    @Schema(description = "从库房ID", example = "31262")
+    @Schema(description = "从库房ID", example = "10413")
     private Long fromDepotId;
 
-    @Schema(description = "从档案柜ID", example = "19367")
+    @Schema(description = "从档案柜ID", example = "12668")
     private Long fromCabinetId;
 
-    @Schema(description = "到立档单位ID", example = "18409")
+    @Schema(description = "到立档单位ID", example = "8930")
     private Long toOrganizationId;
 
-    @Schema(description = "到库房ID", example = "17779")
+    @Schema(description = "到库房ID", example = "30801")
     private Long toDepotId;
 
-    @Schema(description = "到档案柜ID", example = "24097")
+    @Schema(description = "到档案柜ID", example = "1470")
     private Long toCabinetId;
 
-    @Schema(description = "制单人id", example = "24299")
+    @Schema(description = "制单人id", example = "21002")
     private Long createById;
 
     @Schema(description = "案卷数量")
@@ -86,7 +86,7 @@ public class TurnOverPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "流程实例的编号", example = "705")
+    @Schema(description = "流程实例的编号", example = "8680")
     private String processInstanceId;
 
     @Schema(description = "申请类型", example = "2")
@@ -101,10 +101,12 @@ public class TurnOverPageReqVO extends PageParam {
     @Schema(description = "鉴定历史记录id")
     private Long authRecordId;
 
-
     @Schema(description = "文件地址", example = "https://www.iocoder.cn")
     private String fileUrl;
 
     @Schema(description = "文件大小")
     private String fileSize;
+
+    @Schema(description = "文件名", example = "李四")
+    private String fileName;
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/turnover/TurnOverDO.java

@@ -22,7 +22,6 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @NoArgsConstructor
 @AllArgsConstructor
 public class TurnOverDO extends BaseDO {
-
     /**
      * 主键ID
      */
@@ -160,5 +159,10 @@ public class TurnOverDO extends BaseDO {
      * 文件大小
      */
     private String fileSize;
+    /**
+     * 文件名
+     */
+    private String fileName;
+
 
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/turnover/TurnOverMapper.java

@@ -49,6 +49,7 @@ public interface TurnOverMapper extends BaseMapperX<TurnOverDO> {
                 .eqIfPresent(TurnOverDO::getAuthRecordId, reqVO.getAuthRecordId())
                 .eqIfPresent(TurnOverDO::getFileUrl, reqVO.getFileUrl())
                 .eqIfPresent(TurnOverDO::getFileSize, reqVO.getFileSize())
+                .likeIfPresent(TurnOverDO::getFileName, reqVO.getFileName())
                 .orderByDesc(TurnOverDO::getId));
     }
 
@@ -84,6 +85,7 @@ public interface TurnOverMapper extends BaseMapperX<TurnOverDO> {
                 .eqIfPresent(TurnOverDO::getAuthRecordId, reqVO.getAuthRecordId())
                 .eqIfPresent(TurnOverDO::getFileUrl, reqVO.getFileUrl())
                 .eqIfPresent(TurnOverDO::getFileSize, reqVO.getFileSize())
+                .likeIfPresent(TurnOverDO::getFileName, reqVO.getFileName())
                 .orderByDesc(TurnOverDO::getId));
     }
 

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/turnover/TurnOverServiceImpl.java

@@ -165,8 +165,6 @@ public class TurnOverServiceImpl extends MPJBaseServiceImpl<TurnOverMapper, Turn
                 VoucherExportReqVO voucherExportReqVO = new VoucherExportReqVO();
                 voucherExportReqVO.setRecordId(Long.valueOf(recordId));
                 List<VoucherDO> voucherDOS = voucherMapper.selectList(voucherExportReqVO);
-
-
                 for (VoucherDO voucher : voucherDOS
                 ) {
                     try {
@@ -386,7 +384,6 @@ public class TurnOverServiceImpl extends MPJBaseServiceImpl<TurnOverMapper, Turn
                 List<ElectronicCustomerComplaintDO> electronicCustomerComplaintDOS = electronicCustomerComplaintMapper.selectList(electronicCustomerComplaintExportReqVO);
                 for (ElectronicCustomerComplaintDO ec:electronicCustomerComplaintDOS
                 ) {
-
                     try {
                         //客诉档案文件夹
                         String contractPath = folderCaseNum + "/" + ec.getComplaintCode();
@@ -401,7 +398,6 @@ public class TurnOverServiceImpl extends MPJBaseServiceImpl<TurnOverMapper, Turn
                 }
             }
 
-
             //打包zip
             String zipFilePath = zipFolderStr + "/" + UUID.randomUUID() + ".zip";
             File zip = ZipUtil.zip(folderPath, zipFilePath);
@@ -414,6 +410,7 @@ public class TurnOverServiceImpl extends MPJBaseServiceImpl<TurnOverMapper, Turn
             FileDO fileDO = getFileDO(fileUrl);
             turnOver.setFileSize(fileDO.getSize().toString());
             turnOver.setFileUrl(fileUrl);
+            turnOver.setFileName(fileDO.getName());
         }