Merge remote-tracking branch 'origin/main'

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java

@@ -17,6 +17,9 @@ public class ElectronicOtherBaseVO {
     @Schema(description = "表名", example = "李四")
     private String name;
 
+    @Schema(description = "OA/ERP流程编号	")
+    private String flowCode;
+
     @Schema(description = "文件来源")
     private String source;
 
@@ -32,6 +35,9 @@ public class ElectronicOtherBaseVO {
     @Schema(description = "制单人")
     private String createBy;
 
+    @Schema(description = "业务实体id", example = "30866")
+    private Long companyId;
+
     @Schema(description = "业务实体")
     private String company;
 
@@ -47,12 +53,24 @@ public class ElectronicOtherBaseVO {
     @Schema(description = "绝对路径")
     private String fileAp;
 
+    @Schema(description = "流程号", example = "29258")
+    private String flowId;
+
     @Schema(description = "摘要")
     private String note;
 
+    @Schema(description = "所属部门id", example = "18329")
+    private Long deptId;
+
     @Schema(description = "所属部门", example = "张三")
     private String deptName;
 
+    @Schema(description = "归档id", example = "20940")
+    private Long recordId;
+
+    @Schema(description = "用户id", example = "17639")
+    private Long userId;
+
     @Schema(description = "归档状态")
     private String archiveState;
 

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java

@@ -22,6 +22,9 @@ public class ElectronicOtherExcelVO {
     @ExcelProperty("表名")
     private String name;
 
+    @ExcelProperty("OA/ERP流程编号	")
+    private String flowCode;
+
     @ExcelProperty("文件来源")
     private String source;
 
@@ -40,6 +43,9 @@ public class ElectronicOtherExcelVO {
     @ExcelProperty("制单人")
     private String createBy;
 
+    @ExcelProperty("业务实体id")
+    private Long companyId;
+
     @ExcelProperty("业务实体")
     private String company;
 
@@ -55,12 +61,24 @@ public class ElectronicOtherExcelVO {
     @ExcelProperty("绝对路径")
     private String fileAp;
 
+    @ExcelProperty("流程号")
+    private String flowId;
+
     @ExcelProperty("摘要")
     private String note;
 
+    @ExcelProperty("所属部门id")
+    private Long deptId;
+
     @ExcelProperty("所属部门")
     private String deptName;
 
+    @ExcelProperty("归档id")
+    private Long recordId;
+
+    @ExcelProperty("用户id")
+    private Long userId;
+
     @ExcelProperty("归档状态")
     private String archiveState;
 

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java

@@ -16,6 +16,9 @@ public class ElectronicOtherExportReqVO {
     @Schema(description = "表名", example = "李四")
     private String name;
 
+    @Schema(description = "OA/ERP流程编号	")
+    private String flowCode;
+
     @Schema(description = "文件来源")
     private String source;
 
@@ -35,6 +38,9 @@ public class ElectronicOtherExportReqVO {
     @Schema(description = "制单人")
     private String createBy;
 
+    @Schema(description = "业务实体id", example = "30866")
+    private Long companyId;
+
     @Schema(description = "业务实体")
     private String company;
 
@@ -50,12 +56,24 @@ public class ElectronicOtherExportReqVO {
     @Schema(description = "绝对路径")
     private String fileAp;
 
+    @Schema(description = "流程号", example = "29258")
+    private String flowId;
+
     @Schema(description = "摘要")
     private String note;
 
+    @Schema(description = "所属部门id", example = "18329")
+    private Long deptId;
+
     @Schema(description = "所属部门", example = "张三")
     private String deptName;
 
+    @Schema(description = "归档id", example = "20940")
+    private Long recordId;
+
+    @Schema(description = "用户id", example = "17639")
+    private Long userId;
+
     @Schema(description = "归档状态")
     private String archiveState;
 

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java

@@ -18,6 +18,9 @@ public class ElectronicOtherPageReqVO extends PageParam {
     @Schema(description = "表名", example = "李四")
     private String name;
 
+    @Schema(description = "OA/ERP流程编号	")
+    private String flowCode;
+
     @Schema(description = "文件来源")
     private String source;
 
@@ -37,6 +40,9 @@ public class ElectronicOtherPageReqVO extends PageParam {
     @Schema(description = "制单人")
     private String createBy;
 
+    @Schema(description = "业务实体id", example = "30866")
+    private Long companyId;
+
     @Schema(description = "业务实体")
     private String company;
 
@@ -52,12 +58,24 @@ public class ElectronicOtherPageReqVO extends PageParam {
     @Schema(description = "绝对路径")
     private String fileAp;
 
+    @Schema(description = "流程号", example = "29258")
+    private String flowId;
+
     @Schema(description = "摘要")
     private String note;
 
+    @Schema(description = "所属部门id", example = "18329")
+    private Long deptId;
+
     @Schema(description = "所属部门", example = "张三")
     private String deptName;
 
+    @Schema(description = "归档id", example = "20940")
+    private Long recordId;
+
+    @Schema(description = "用户id", example = "17639")
+    private Long userId;
+
     @Schema(description = "归档状态")
     private String archiveState;
 

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherRespVO.java

@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class ElectronicOtherRespVO extends ElectronicOtherBaseVO {
 
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "29291")
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9922")
     private Long id;
 
     @Schema(description = "创建时间")

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherUpdateReqVO.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.*;
 @ToString(callSuper = true)
 public class ElectronicOtherUpdateReqVO extends ElectronicOtherBaseVO {
 
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "29291")
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9922")
     @NotNull(message = "主键不能为空")
     private Long id;
 

yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electronicother/ElectronicOtherMapper.java

@@ -20,19 +20,25 @@ public interface ElectronicOtherMapper extends BaseMapperX<ElectronicOtherDO> {
     default PageResult<ElectronicOtherDO> selectPage(ElectronicOtherPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ElectronicOtherDO>()
                 .likeIfPresent(ElectronicOtherDO::getName, reqVO.getName())
+                .eqIfPresent(ElectronicOtherDO::getFlowCode, reqVO.getFlowCode())
                 .eqIfPresent(ElectronicOtherDO::getSource, reqVO.getSource())
                 .eqIfPresent(ElectronicOtherDO::getYear, reqVO.getYear())
                 .eqIfPresent(ElectronicOtherDO::getPeriod, reqVO.getPeriod())
                 .eqIfPresent(ElectronicOtherDO::getBusinessType, reqVO.getBusinessType())
                 .betweenIfPresent(ElectronicOtherDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ElectronicOtherDO::getCreateBy, reqVO.getCreateBy())
+                .eqIfPresent(ElectronicOtherDO::getCompanyId, reqVO.getCompanyId())
                 .eqIfPresent(ElectronicOtherDO::getCompany, reqVO.getCompany())
                 .eqIfPresent(ElectronicOtherDO::getDelStatus, reqVO.getDelStatus())
                 .eqIfPresent(ElectronicOtherDO::getSuffix, reqVO.getSuffix())
                 .eqIfPresent(ElectronicOtherDO::getFileUrl, reqVO.getFileUrl())
                 .eqIfPresent(ElectronicOtherDO::getFileAp, reqVO.getFileAp())
+                .eqIfPresent(ElectronicOtherDO::getFlowId, reqVO.getFlowId())
                 .eqIfPresent(ElectronicOtherDO::getNote, reqVO.getNote())
+                .eqIfPresent(ElectronicOtherDO::getDeptId, reqVO.getDeptId())
                 .likeIfPresent(ElectronicOtherDO::getDeptName, reqVO.getDeptName())
+                .eqIfPresent(ElectronicOtherDO::getRecordId, reqVO.getRecordId())
+                .eqIfPresent(ElectronicOtherDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(ElectronicOtherDO::getArchiveState, reqVO.getArchiveState())
                 .orderByDesc(ElectronicOtherDO::getId));
     }
@@ -40,19 +46,25 @@ public interface ElectronicOtherMapper extends BaseMapperX<ElectronicOtherDO> {
     default List<ElectronicOtherDO> selectList(ElectronicOtherExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ElectronicOtherDO>()
                 .likeIfPresent(ElectronicOtherDO::getName, reqVO.getName())
+                .eqIfPresent(ElectronicOtherDO::getFlowCode, reqVO.getFlowCode())
                 .eqIfPresent(ElectronicOtherDO::getSource, reqVO.getSource())
                 .eqIfPresent(ElectronicOtherDO::getYear, reqVO.getYear())
                 .eqIfPresent(ElectronicOtherDO::getPeriod, reqVO.getPeriod())
                 .eqIfPresent(ElectronicOtherDO::getBusinessType, reqVO.getBusinessType())
                 .betweenIfPresent(ElectronicOtherDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ElectronicOtherDO::getCreateBy, reqVO.getCreateBy())
+                .eqIfPresent(ElectronicOtherDO::getCompanyId, reqVO.getCompanyId())
                 .eqIfPresent(ElectronicOtherDO::getCompany, reqVO.getCompany())
                 .eqIfPresent(ElectronicOtherDO::getDelStatus, reqVO.getDelStatus())
                 .eqIfPresent(ElectronicOtherDO::getSuffix, reqVO.getSuffix())
                 .eqIfPresent(ElectronicOtherDO::getFileUrl, reqVO.getFileUrl())
                 .eqIfPresent(ElectronicOtherDO::getFileAp, reqVO.getFileAp())
+                .eqIfPresent(ElectronicOtherDO::getFlowId, reqVO.getFlowId())
                 .eqIfPresent(ElectronicOtherDO::getNote, reqVO.getNote())
+                .eqIfPresent(ElectronicOtherDO::getDeptId, reqVO.getDeptId())
                 .likeIfPresent(ElectronicOtherDO::getDeptName, reqVO.getDeptName())
+                .eqIfPresent(ElectronicOtherDO::getRecordId, reqVO.getRecordId())
+                .eqIfPresent(ElectronicOtherDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(ElectronicOtherDO::getArchiveState, reqVO.getArchiveState())
                 .orderByDesc(ElectronicOtherDO::getId));
     }

yudao-module-electronic/yudao-module-ea-biz/src/main/resources/mapper/electronicother/ElectronicOtherMapper.xml

@@ -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.ea.dal.mysql.electronicother.ElectronicOtherMapper">
-
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-</mapper>