Js
/
lyr-one-test
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审批流程模块迁移

Browse Source
new
LAPTOP-0SF788NU\admin 1 year ago
parent f359d6b3c5
commit 427133eff7
16 changed files with 104 additions and 96 deletions
Show Stats Download Patch File Download Diff File

2
yudao-module-accounting/yudao-module-accounting-api/src/main/java/cn/iocoder/yudao/module/accounting/enums/ErrorCodeConstants.java
Unescape Escape View File

@ -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, "银行回单不存在");
}

48
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/FlowController.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/FlowController.java
Unescape Escape View File

@ -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.servlet.http.*;
import javax.annotation.Resource;
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.io.IOException;
import java.util.Collection;
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 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;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 审批流程")
@RestController

9
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/vo/FlowBaseVO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowBaseVO.java
Unescape Escape View File

@ -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 java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import lombok.Data;
/**
* 审批流程 Base VO，提供给添加、修改、详细的子 VO 使用

8
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/vo/FlowCreateReqVO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowCreateReqVO.java
Unescape Escape View File

@ -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

12
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/vo/FlowExcelVO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExcelVO.java
Unescape Escape View File

@ -1,13 +1,9 @@
package cn.iocoder.yudao.module.archives.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;
package cn.iocoder.yudao.module.accounting.controller.admin.flow.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 审批流程 Excel VO

9
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/vo/FlowExportReqVO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowExportReqVO.java
Unescape Escape View File

@ -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 java.time.LocalDateTime;
import lombok.Data;
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 是一致的")

10
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/vo/FlowPageReqVO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowPageReqVO.java
Unescape Escape View File

@ -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;

7
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/vo/FlowRespVO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowRespVO.java
Unescape Escape View File

@ -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")

10
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/flow/vo/FlowUpdateReqVO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/flow/vo/FlowUpdateReqVO.java
Unescape Escape View File

@ -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 java.util.*;
import javax.validation.constraints.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 审批流程更新 Request VO")
@Data

14
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/convert/flow/FlowConvert.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/convert/flow/FlowConvert.java
Unescape Escape View File

@ -1,13 +1,15 @@
package cn.iocoder.yudao.module.archives.convert.flow;
import java.util.*;
package cn.iocoder.yudao.module.accounting.convert.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.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

13
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/dataobject/flow/FlowDO.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/dataobject/flow/FlowDO.java
Unescape Escape View File

@ -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;
/**

13
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/dal/mysql/flow/FlowMapper.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/dal/mysql/flow/FlowMapper.java
Unescape Escape View File

@ -1,13 +1,14 @@
package cn.iocoder.yudao.module.archives.dal.mysql.flow;
import java.util.*;
package cn.iocoder.yudao.module.accounting.dal.mysql.flow;
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

17
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/flow/FlowService.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/service/flow/FlowService.java
Unescape Escape View File

@ -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 接口

25
yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/flow/FlowServiceImpl.java → yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/service/flow/FlowServiceImpl.java
Unescape Escape View File

@ -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 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.archives.convert.flow.FlowConvert;
import cn.iocoder.yudao.module.archives.dal.mysql.flow.FlowMapper;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
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 实现类

2
yudao-module-archives/yudao-module-archives-biz/src/main/resources/mapper/flow/FlowMapper.xml → yudao-module-accounting/yudao-module-accounting-biz/src/main/resources/mapper/flow/FlowMapper.xml
Unescape Escape View File

@ -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 增删改查即可。

1
yudao-module-archives/yudao-module-archives-api/src/main/java/cn/iocoder/yudao/module/archives/enums/ErrorCodeConstants.java
Unescape Escape View File

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