opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 10:13:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 调整请假申请包结构

Browse Source
This commit is contained in:
songgaoshuai 2023-11-28 13:15:47 +08:00
parent db834bfbd0
commit 2133a72c29
9 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-modules/ruoyi-demo/pom.xml
View File

@ -63,11 +63,6 @@
<artifactId>ruoyi-common-excel</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
@ -102,11 +97,6 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-workflow</artifactId>
</dependency>
<!-- 短信 用哪个导入哪个依赖 -->
<!-- <dependency>-->
<!-- <groupId>com.aliyun</groupId>-->
@ -117,6 +107,7 @@
<!-- <groupId>com.tencentcloudapi</groupId>-->
<!-- <artifactId>tencentcloud-sdk-java-sms</artifactId>-->
<!-- </dependency>-->
</dependencies>
</project>

10
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestLeaveController.java → ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
View File

@ -1,4 +1,4 @@
package org.dromara.demo.controller;
package org.dromara.workflow.controller;
import java.util.List;
@ -6,7 +6,10 @@ import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.demo.domain.TestLeave;
import org.dromara.workflow.domain.TestLeave;
import org.dromara.workflow.domain.bo.TestLeaveBo;
import org.dromara.workflow.domain.vo.TestLeaveVo;
import org.dromara.workflow.service.ITestLeaveService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -18,9 +21,6 @@ import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.demo.domain.vo.TestLeaveVo;
import org.dromara.demo.domain.bo.TestLeaveBo;
import org.dromara.demo.service.ITestLeaveService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestLeave.java → ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java
View File

@ -1,4 +1,4 @@
package org.dromara.demo.domain;
package org.dromara.workflow.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;

4
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestLeaveBo.java → ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
View File

@ -1,6 +1,6 @@
package org.dromara.demo.domain.bo;
package org.dromara.workflow.domain.bo;
import org.dromara.demo.domain.TestLeave;
import org.dromara.workflow.domain.TestLeave;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;

7
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestLeaveVo.java → ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
View File

@ -1,17 +1,14 @@
package org.dromara.demo.domain.vo;
package org.dromara.workflow.domain.vo;
import org.dromara.demo.domain.TestLeave;
import org.dromara.workflow.domain.TestLeave;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.workflow.domain.vo.ProcessInstanceVo;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

6
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestLeaveMapper.java → ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java
View File

@ -1,7 +1,7 @@
package org.dromara.demo.mapper;
package org.dromara.workflow.mapper;
import org.dromara.demo.domain.TestLeave;
import org.dromara.demo.domain.vo.TestLeaveVo;
import org.dromara.workflow.domain.TestLeave;
import org.dromara.workflow.domain.vo.TestLeaveVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

8
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestLeaveService.java → ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java
View File

@ -1,8 +1,8 @@
package org.dromara.demo.service;
package org.dromara.workflow.service;
import org.dromara.demo.domain.TestLeave;
import org.dromara.demo.domain.vo.TestLeaveVo;
import org.dromara.demo.domain.bo.TestLeaveBo;
import org.dromara.workflow.domain.TestLeave;
import org.dromara.workflow.domain.vo.TestLeaveVo;
import org.dromara.workflow.domain.bo.TestLeaveBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

12
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestLeaveServiceImpl.java → ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
View File

@ -1,4 +1,4 @@
package org.dromara.demo.service.impl;
package org.dromara.workflow.service.impl;
import cn.hutool.core.collection.CollUtil;
import org.dromara.common.core.utils.MapstructUtils;
@ -13,11 +13,11 @@ import lombok.RequiredArgsConstructor;
import org.dromara.workflow.service.IActProcessInstanceService;
import org.dromara.workflow.utils.WorkflowUtils;
import org.springframework.stereotype.Service;
import org.dromara.demo.domain.bo.TestLeaveBo;
import org.dromara.demo.domain.vo.TestLeaveVo;
import org.dromara.demo.domain.TestLeave;
import org.dromara.demo.mapper.TestLeaveMapper;
import org.dromara.demo.service.ITestLeaveService;
import org.dromara.workflow.domain.bo.TestLeaveBo;
import org.dromara.workflow.domain.vo.TestLeaveVo;
import org.dromara.workflow.domain.TestLeave;
import org.dromara.workflow.mapper.TestLeaveMapper;
import org.dromara.workflow.service.ITestLeaveService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;

2
ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestLeaveMapper.xml → ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.demo.mapper.TestLeaveMapper">
<mapper namespace="org.dromara.workflow.mapper.TestLeaveMapper">
</mapper>