审批流程模块迁移

yudao-module-accounting/yudao-module-accounting-api/src/main/java/cn/iocoder/yudao/module/accounting/enums/ErrorCodeConstants.java

@@ -13,6 +13,8 @@ public interface ErrorCodeConstants {
     ErrorCode ACCOUNTING_REPORT_NOT_EXISTS = new ErrorCode(500100, "会计报表不存在");
     ErrorCode INVOICES_NOT_EXISTS = new ErrorCode(400100, "发票不存在");
 
+    ErrorCode FLOW_NOT_EXISTS = new ErrorCode(300400, "审批流程不存在");
+
     ErrorCode BANK_SLIP_NOT_EXISTS = new ErrorCode(400500, "银行回单不存在");
 
 }

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/FlowController.java

@@ -1,39 +1,37 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow;
 
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.*;
+import cn.iocoder.yudao.module.accounting.convert.flow.FlowConvert;
+import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO;
+import cn.iocoder.yudao.module.accounting.service.flow.FlowService;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import cn.iocoder.yudao.module.setting.service.passwords.PasswordsService;
 import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSONObject;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Collection;
-import java.io.IOException;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.archives.controller.admin.flow.vo.*;
-import cn.iocoder.yudao.module.archives.dal.dataobject.flow.FlowDO;
-import cn.iocoder.yudao.module.archives.convert.flow.FlowConvert;
-import cn.iocoder.yudao.module.archives.service.flow.FlowService;
-import org.springframework.web.multipart.MultipartFile;
-import sun.security.util.Password;
 
 @Tag(name = "管理后台 - 审批流程")
 @RestController

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowBaseVO.java

@@ -1,12 +1,7 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow.vo;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 
 /**
  * 审批流程 Base VO，提供给添加、修改、详细的子 VO 使用

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowCreateReqVO.java

@@ -1,9 +1,9 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow.vo;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import javax.validation.constraints.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 审批流程创建 Request VO")
 @Data

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExcelVO.java

@@ -1,13 +1,9 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow.vo;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow.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

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExportReqVO.java

@@ -1,12 +1,11 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow.vo;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
-import java.time.LocalDateTime;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 审批流程 Excel 导出 Request VO，参数和 FlowPageReqVO 是一致的")

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowPageReqVO.java

@@ -1,10 +1,12 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow.vo;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowRespVO.java

@@ -1,7 +1,10 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow.vo;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 审批流程 Response VO")

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowUpdateReqVO.java

@@ -1,9 +1,11 @@
-package cn.iocoder.yudao.module.archives.controller.admin.flow.vo;
+package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 审批流程更新 Request VO")
 @Data

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/convert/flow/FlowConvert.java

@@ -1,13 +1,15 @@
-package cn.iocoder.yudao.module.archives.convert.flow;
+package cn.iocoder.yudao.module.accounting.convert.flow;
-
-import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowCreateReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowExcelVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowRespVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowUpdateReqVO;
+import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.archives.controller.admin.flow.vo.*;
+
-import cn.iocoder.yudao.module.archives.dal.dataobject.flow.FlowDO;
+import java.util.List;
 
 /**
  * 审批流程 Convert

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/flow/FlowDO.java

@@ -1,13 +1,10 @@
-package cn.iocoder.yudao.module.archives.dal.dataobject.flow;
+package cn.iocoder.yudao.module.accounting.dal.dataobject.flow;
 
-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.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 /**

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/flow/FlowMapper.java

@@ -1,13 +1,14 @@
-package cn.iocoder.yudao.module.archives.dal.mysql.flow;
+package cn.iocoder.yudao.module.accounting.dal.mysql.flow;
-
-import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.archives.dal.dataobject.flow.FlowDO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowExportReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowPageReqVO;
+import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.archives.controller.admin.flow.vo.*;
+
+import java.util.List;
 
 /**
  * 审批流程 Mapper

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/service/flow/FlowService.java

@@ -1,10 +1,17 @@
-package cn.iocoder.yudao.module.archives.service.flow;
+package cn.iocoder.yudao.module.accounting.service.flow;
+
+
 
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.archives.controller.admin.flow.vo.*;
-import cn.iocoder.yudao.module.archives.dal.dataobject.flow.FlowDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowCreateReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowExportReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowPageReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowUpdateReqVO;
+import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 审批流程 Service 接口

yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/service/flow/FlowServiceImpl.java

@@ -1,19 +1,24 @@
-package cn.iocoder.yudao.module.archives.service.flow;
+package cn.iocoder.yudao.module.accounting.service.flow;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowCreateReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowExportReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowPageReqVO;
+import cn.iocoder.yudao.module.accounting.controller.admin.flow.vo.FlowUpdateReqVO;
+import cn.iocoder.yudao.module.accounting.convert.flow.FlowConvert;
+import cn.iocoder.yudao.module.accounting.dal.dataobject.flow.FlowDO;
+import cn.iocoder.yudao.module.accounting.dal.mysql.flow.FlowMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
+import javax.annotation.Resource;
-import cn.iocoder.yudao.module.archives.controller.admin.flow.vo.*;
+import java.util.Collection;
-import cn.iocoder.yudao.module.archives.dal.dataobject.flow.FlowDO;
+import java.util.List;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import cn.iocoder.yudao.module.archives.convert.flow.FlowConvert;
-import cn.iocoder.yudao.module.archives.dal.mysql.flow.FlowMapper;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.archives.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.accounting.enums.ErrorCodeConstants.FLOW_NOT_EXISTS;
+
 
 /**
  * 审批流程 Service 实现类

yudao-module-accounting/yudao-module-accounting-biz/src/main/resources/mapper/flow/FlowMapper.xml

@@ -1,6 +1,6 @@
 <?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.flow.FlowMapper">
+<mapper namespace="cn.iocoder.yudao.module.accounting.dal.mysql.flow.FlowMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

yudao-module-archives/yudao-module-archives-api/src/main/java/cn/iocoder/yudao/module/archives/enums/ErrorCodeConstants.java

@@ -11,7 +11,6 @@ public interface ErrorCodeConstants {
 
     ErrorCode AUTHENTICATE_NOT_EXISTS = new ErrorCode(300300,"档案鉴定历史不存在");
 
-    ErrorCode FLOW_NOT_EXISTS = new ErrorCode(300400, "审批流程不存在");
 
 
 }