ZF/pointlion-oa
1
0
Fork 0
mirror of https://gitee.com/glorylion/pointlion-oa.git synced 2025-12-30 10:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改初始化

Browse Source
This commit is contained in:
李阳
2023-06-20 21:45:05 +08:00
parent c155cbc8a0
commit efd9e0bb28
491 changed files with 2560 additions and 13574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored Normal file
View File

@@ -0,0 +1,7 @@
/PointLion/target/
/pointlion-admin/target/
/pointlion-common/target/
/pointlion-framework/target/
/pointlion-generator/target/
/pointlion-quartz/target/
/pointlion-system/target/

10
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,10 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Zeppelin ignored files
/ZeppelinRemoteNotebooks/

20
.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="PointLion" />
<module name="pointlion-system" />
<module name="pointlion-quartz" />
<module name="pointlion-admin" />
<module name="pointlion-common" />
<module name="pointlion-generator" />
<module name="pointlion-framework" />
</profile>
</annotationProcessing>
</component>
</project>

21
.idea/encodings.xml generated Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/PointLion/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PointLion/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-admin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-framework/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-framework/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-generator/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-generator/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-quartz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-quartz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-system/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pointlion-system/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

30
.idea/jarRepositories.xml generated Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="public" />
<option name="name" value="aliyun nexus" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven-public" />
<option name="name" value="central-repository" />
<option name="url" value="http://maven.openserver.cn:8090/repository/maven-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://maven.openserver.cn:8090/repository/maven-public/" />
</remote-repository>
</component>
</project>

12
.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

12
PointLion/pom.xml
View File

@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<artifactId>pointlion</artifactId>
<groupId>com.pointlion</groupId>
<version>3.8.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,8 +14,8 @@
<dependencies>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<groupId>com.pointlion</groupId>
<artifactId>pointlion-framework</artifactId>
</dependency>
<!-- hutool常用工具类 -->
@@ -31,8 +31,8 @@
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
<groupId>com.pointlion</groupId>
<artifactId>pointlion-common</artifactId>
</dependency>
<!-- flowable 流程引擎-->
<dependency>

9
PointLion/src/main/java/com/ruoyi/back/home/controller/PointLionHomeController.java → PointLion/src/main/java/com/pointlion/back/home/controller/PointLionHomeController.java
View File

@@ -1,9 +1,8 @@
package com.ruoyi.back.home.controller;
package com.pointlion.back.home.controller;
import com.itextpdf.text.BaseColor;
import com.ruoyi.back.home.service.HomeService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.pointlion.back.home.service.HomeService;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

2
PointLion/src/main/java/com/ruoyi/back/home/mapper/HomeMapper.java → PointLion/src/main/java/com/pointlion/back/home/mapper/HomeMapper.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.home.mapper;
package com.pointlion.back.home.mapper;
import java.util.Map;

4
PointLion/src/main/java/com/ruoyi/back/home/service/HomeService.java → PointLion/src/main/java/com/pointlion/back/home/service/HomeService.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.back.home.service;
package com.pointlion.back.home.service;
import com.ruoyi.back.home.mapper.HomeMapper;
import com.pointlion.back.home.mapper.HomeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

4
PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableConfig.java → PointLion/src/main/java/com/pointlion/back/oa/config/FlowableConfig.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.back.oa.config;
package com.pointlion.back.oa.config;
import com.ruoyi.back.oa.service.flowImg.CustomProcessDiagramGenerator;
import com.pointlion.back.oa.service.flowImg.CustomProcessDiagramGenerator;
import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.flowable.spring.boot.ProcessEngineConfigurationConfigurer;

6
PointLion/src/main/java/com/ruoyi/back/oa/config/FlowableGlobListenerConfig.java → PointLion/src/main/java/com/pointlion/back/oa/config/FlowableGlobListenerConfig.java
View File

@@ -1,8 +1,8 @@
package com.ruoyi.back.oa.config;
package com.pointlion.back.oa.config;
import com.ruoyi.back.oa.listener.GlobalProcessStartedListener;
import com.ruoyi.back.oa.listener.GlobalProcistEndListener;
import com.pointlion.back.oa.listener.GlobalProcessStartedListener;
import com.pointlion.back.oa.listener.GlobalProcistEndListener;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
import org.flowable.spring.SpringProcessEngineConfiguration;

2
PointLion/src/main/java/com/ruoyi/back/oa/constant/WorkflowConstants.java → PointLion/src/main/java/com/pointlion/back/oa/constant/WorkflowConstants.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.constant;
package com.pointlion.back.oa.constant;
import java.awt.*;

20
PointLion/src/main/java/com/ruoyi/back/oa/controller/ActHiTaskinstController.java → PointLion/src/main/java/com/pointlion/back/oa/controller/FlowHiTaskinstController.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.controller;
package com.pointlion.back.oa.controller;
import java.util.List;
import java.util.Map;
@@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.ActHiTaskinst;
import com.ruoyi.back.oa.service.ActHiTaskinstService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.pointlion.common.annotation.Log;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import com.pointlion.common.enums.BusinessType;
import com.pointlion.back.oa.domain.ActHiTaskinst;
import com.pointlion.back.oa.service.ActHiTaskinstService;
import com.pointlion.common.utils.poi.ExcelUtil;
import com.pointlion.common.core.page.TableDataInfo;
/**
* 历史任务Controller
@@ -30,7 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
*/
@RestController
@RequestMapping("/oa/actHiTaskInst")
public class ActHiTaskinstController extends BaseController
public class FlowHiTaskinstController extends BaseController
{
@Autowired
private ActHiTaskinstService actHiTaskinstService;

12
PointLion/src/main/java/com/ruoyi/back/oa/controller/FlowImgController.java → PointLion/src/main/java/com/pointlion/back/oa/controller/FlowImgController.java
View File

@@ -1,10 +1,10 @@
package com.ruoyi.back.oa.controller;
package com.pointlion.back.oa.controller;
import com.ruoyi.back.oa.domain.FlowProcessInstance;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.back.oa.service.FlowImgService;
import com.pointlion.back.oa.domain.FlowProcessInstance;
import com.pointlion.common.annotation.Log;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import com.pointlion.back.oa.service.FlowImgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

57
PointLion/src/main/java/com/pointlion/back/oa/controller/FlowProcessInsController.java Normal file
View File

@@ -0,0 +1,57 @@
package com.pointlion.back.oa.controller;
import com.pointlion.back.oa.domain.FlowProcessInstance;
import com.pointlion.back.oa.service.FlowProcessInstanceService;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/***
* @des
* @author Ly
* @date 2023/5/31
*/
@RestController
@RequestMapping("/oa/processInstance")
public class FlowProcessInsController extends BaseController {
@Autowired
private FlowProcessInstanceService flowProcessInstanceService;
@RequestMapping("/deleteAllProcessInstance")
public AjaxResult deleteAllProcessInstance(){
flowProcessInstanceService.deleteAllProcessInstance();
return success();
}
/*****
* 提交流程
* @param ins
* @return
* @throws Exception
*/
@RequestMapping("/submitFlow")
public AjaxResult submitFlow(@RequestBody FlowProcessInstance ins) throws Exception {
flowProcessInstanceService.submitFlow(ins);
return success();
}
/*****
* 取回流程
* @param ins
* @return
* @throws Exception
*/
@RequestMapping("/cancleFlow")
public AjaxResult cancleFlow(@RequestBody FlowProcessInstance ins) throws Exception {
flowProcessInstanceService.cancleFlow(ins);
return success();
}
}

19
PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReModelController.java → PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReModelController.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.controller;
package com.pointlion.back.oa.controller;
import java.util.LinkedHashMap;
import java.util.List;
@@ -6,20 +6,18 @@ import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.Page;
import com.ruoyi.back.oa.service.ActReModelService;
import com.pointlion.back.oa.service.ActReModelService;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.impl.persistence.entity.ModelEntityImpl;
import org.flowable.engine.repository.Model;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
//import com.ruoyi.oa.domain.ActReModel;
//import com.ruoyi.oa.service.IActReModelService;
import com.ruoyi.common.core.page.TableDataInfo;
import com.pointlion.common.annotation.Log;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import com.pointlion.common.enums.BusinessType;
import com.pointlion.common.core.page.TableDataInfo;
/**
* 流程图Controller
@@ -29,7 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
*/
@RestController
@RequestMapping("/oa/model")
public class ActReModelController extends BaseController
public class FlowReModelController extends BaseController
{
@Autowired
@@ -42,6 +40,7 @@ public class ActReModelController extends BaseController
@PreAuthorize("@ss.hasPermi('oa:model:list')")
@GetMapping("/list")
public TableDataInfo list(ModelEntityImpl modelEntity) {
startPage();
Page<Model> list = actReModelService.list(modelEntity);
return getDataTable(list);
}

18
PointLion/src/main/java/com/ruoyi/back/oa/controller/ActReProcdefController.java → PointLion/src/main/java/com/pointlion/back/oa/controller/FlowReProcdefController.java
View File

@@ -1,13 +1,13 @@
package com.ruoyi.back.oa.controller;
package com.pointlion.back.oa.controller;
import cn.hutool.core.util.ArrayUtil;
import com.ruoyi.back.oa.domain.ActReProcdef;
import com.ruoyi.back.erp.service.ActReProcdefService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.pointlion.back.oa.domain.ActReProcdef;
import com.pointlion.back.oa.service.ActReProcdefService;
import com.pointlion.common.annotation.Log;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import com.pointlion.common.core.page.TableDataInfo;
import com.pointlion.common.enums.BusinessType;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +28,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/oa/definition")
public class ActReProcdefController extends BaseController
public class FlowReProcdefController extends BaseController
{
@Autowired
private ActReProcdefService actReProcdefService;

46
PointLion/src/main/java/com/ruoyi/back/oa/controller/VTasklistController.java → PointLion/src/main/java/com/pointlion/back/oa/controller/VTasklistController.java
View File

@@ -1,23 +1,23 @@
package com.ruoyi.back.oa.controller;
package com.pointlion.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.back.oa.domain.CommitTask;
import com.ruoyi.back.oa.domain.FlowProcessInstance;
import com.ruoyi.back.oa.service.VTasklistService;
import com.ruoyi.back.oa.domain.OaCustomFormApply;
import com.ruoyi.back.oa.service.OaTaskService;
import com.pointlion.back.oa.domain.CommitTask;
import com.pointlion.back.oa.domain.FlowProcessInstance;
import com.pointlion.back.oa.service.VTasklistService;
//import com.pointlion.back.oa.domain.OaCustomFormApply;
//import com.pointlion.back.oa.service.OaTaskService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.VTasklist;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.pointlion.common.annotation.Log;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import com.pointlion.common.enums.BusinessType;
import com.pointlion.back.oa.domain.VTasklist;
import com.pointlion.common.utils.poi.ExcelUtil;
import com.pointlion.common.core.page.TableDataInfo;
/**
* 我的待办Controller
@@ -31,8 +31,8 @@ public class VTasklistController extends BaseController
{
@Autowired
private VTasklistService vTasklistService;
@Autowired
private OaTaskService oaTaskService;
//@Autowired
//private OaTaskService oaTaskService;
/**
@@ -110,14 +110,14 @@ public class VTasklistController extends BaseController
/**
* 获取我的待办详细信息
*/
@GetMapping(value = "/getCustomFormByTaskId/{taskId}")
public AjaxResult getCustomFormByTaskId(@PathVariable("taskId") String taskId)
{
OaCustomFormApply oaCustomFormApply = oaTaskService.getCustomFormByTaskId(taskId);
return AjaxResult.success(oaCustomFormApply);
}
//@GetMapping(value = "/getCustomFormByTaskId/{taskId}")
//public AjaxResult getCustomFormByTaskId(@PathVariable("taskId") String taskId)
//{
//
// OaCustomFormApply oaCustomFormApply = oaTaskService.getCustomFormByTaskId(taskId);
//
// return AjaxResult.success(oaCustomFormApply);
//}
/******

6
PointLion/src/main/java/com/ruoyi/back/oa/domain/ActHiTaskinst.java → PointLion/src/main/java/com/pointlion/back/oa/domain/ActHiTaskinst.java
View File

@@ -1,12 +1,12 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import lombok.Data;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.pointlion.common.annotation.Excel;
import com.pointlion.common.core.domain.BaseEntity;
/**
* 历史任务对象 act_hi_taskinst

6
PointLion/src/main/java/com/ruoyi/back/oa/domain/ActReProcdef.java → PointLion/src/main/java/com/pointlion/back/oa/domain/ActReProcdef.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.pointlion.common.annotation.Excel;
import com.pointlion.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;

2
PointLion/src/main/java/com/ruoyi/back/oa/domain/CommitTask.java → PointLion/src/main/java/com/pointlion/back/oa/domain/CommitTask.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import lombok.Data;

4
PointLion/src/main/java/com/ruoyi/back/oa/domain/FlowProcessInstance.java → PointLion/src/main/java/com/pointlion/back/oa/domain/FlowProcessInstance.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import lombok.Data;
@@ -12,7 +12,7 @@ public class FlowProcessInstance {
private String billType;
private String businessId;
private Long businessId;

6
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdCar.java → PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdCar.java
View File

@@ -1,10 +1,10 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.pointlion.common.annotation.Excel;
import com.pointlion.common.core.domain.BaseEntity;
/**
* 车辆管理对象 oa_bd_car

6
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdMeetingroom.java → PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdMeetingroom.java
View File

@@ -1,10 +1,10 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.pointlion.common.annotation.Excel;
import com.pointlion.common.core.domain.BaseEntity;
/**
* 会议室管理对象 oa_bd_meetingroom

6
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaBdSeal.java → PointLion/src/main/java/com/pointlion/back/oa/domain/OaBdSeal.java
View File

@@ -1,10 +1,10 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.pointlion.common.annotation.Excel;
import com.pointlion.common.core.domain.BaseEntity;
/**
* 公章管理对象 oa_bd_seal

6
PointLion/src/main/java/com/ruoyi/back/oa/domain/VTasklist.java → PointLion/src/main/java/com/pointlion/back/oa/domain/VTasklist.java
View File

@@ -1,10 +1,10 @@
package com.ruoyi.back.oa.domain;
package com.pointlion.back.oa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.pointlion.common.annotation.Excel;
import com.pointlion.common.core.domain.BaseEntity;
/**
* 我的待办对象 v_tasklist

2
PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcessStartedListener.java → PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcessStartedListener.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.listener;
package com.pointlion.back.oa.listener;
import org.flowable.engine.delegate.event.impl.FlowableEntityEventImpl;
import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener;

6
PointLion/src/main/java/com/ruoyi/back/oa/listener/GlobalProcistEndListener.java → PointLion/src/main/java/com/pointlion/back/oa/listener/GlobalProcistEndListener.java
View File

@@ -1,9 +1,9 @@
package com.ruoyi.back.oa.listener;
package com.pointlion.back.oa.listener;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.back.oa.mapper.FlowProcessMapper;
import com.ruoyi.common.constant.CommonConstants;
import com.pointlion.back.oa.mapper.FlowProcessMapper;
import com.pointlion.common.constant.CommonConstants;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener;
import org.flowable.engine.delegate.event.impl.FlowableEntityEventImpl;

4
PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActHiTaskinstMapper.java → PointLion/src/main/java/com/pointlion/back/oa/mapper/ActHiTaskinstMapper.java
View File

@@ -1,9 +1,9 @@
package com.ruoyi.back.oa.mapper;
package com.pointlion.back.oa.mapper;
import java.util.List;
import java.util.Map;
import com.ruoyi.back.oa.domain.ActHiTaskinst;
import com.pointlion.back.oa.domain.ActHiTaskinst;
/**
* 历史任务Mapper接口

4
PointLion/src/main/java/com/ruoyi/back/oa/mapper/ActReProcdefMapper.java → PointLion/src/main/java/com/pointlion/back/oa/mapper/ActReProcdefMapper.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.back.oa.mapper;
package com.pointlion.back.oa.mapper;
import com.ruoyi.back.oa.domain.ActReProcdef;
import com.pointlion.back.oa.domain.ActReProcdef;
import java.util.List;

5
PointLion/src/main/java/com/ruoyi/back/oa/mapper/FlowProcessMapper.java → PointLion/src/main/java/com/pointlion/back/oa/mapper/FlowProcessMapper.java
View File

@@ -1,10 +1,7 @@
package com.ruoyi.back.oa.mapper;
package com.pointlion.back.oa.mapper;
import com.ruoyi.back.oa.domain.VTasklist;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 流程实例
*

4
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdCarMapper.java → PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdCarMapper.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.back.oa.mapper;
package com.pointlion.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaBdCar;
import com.pointlion.back.oa.domain.OaBdCar;
/**
* 车辆管理Mapper接口

4
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdMeetingroomMapper.java → PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdMeetingroomMapper.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.back.oa.mapper;
package com.pointlion.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaBdMeetingroom;
import com.pointlion.back.oa.domain.OaBdMeetingroom;
/**
* 会议室管理Mapper接口

4
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaBdSealMapper.java → PointLion/src/main/java/com/pointlion/back/oa/mapper/OaBdSealMapper.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.back.oa.mapper;
package com.pointlion.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaBdSeal;
import com.pointlion.back.oa.domain.OaBdSeal;
/**
* 公章管理Mapper接口

4
PointLion/src/main/java/com/ruoyi/back/oa/mapper/VTasklistMapper.java → PointLion/src/main/java/com/pointlion/back/oa/mapper/VTasklistMapper.java
View File

@@ -1,8 +1,8 @@
package com.ruoyi.back.oa.mapper;
package com.pointlion.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.VTasklist;
import com.pointlion.back.oa.domain.VTasklist;
/**
* 我的待办Mapper接口

6
PointLion/src/main/java/com/ruoyi/back/oa/service/ActHiTaskinstService.java → PointLion/src/main/java/com/pointlion/back/oa/service/ActHiTaskinstService.java
View File

@@ -1,12 +1,12 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.back.oa.mapper.ActHiTaskinstMapper;
import com.ruoyi.back.oa.domain.ActHiTaskinst;
import com.pointlion.back.oa.mapper.ActHiTaskinstMapper;
import com.pointlion.back.oa.domain.ActHiTaskinst;
/**
* 历史任务Service业务层处理

24
PointLion/src/main/java/com/ruoyi/back/oa/service/ActReModelService.java → PointLion/src/main/java/com/pointlion/back/oa/service/ActReModelService.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import cn.hutool.core.lang.UUID;
import cn.hutool.json.JSONObject;
@@ -6,14 +6,14 @@ import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.github.pagehelper.Page;
import com.ruoyi.back.erp.service.BaseService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.pointlion.common.service.base.BaseService;
import com.pointlion.common.annotation.DataScope;
import com.pointlion.common.core.domain.entity.SysRole;
import com.pointlion.common.core.domain.entity.SysUser;
import com.pointlion.common.core.page.PageDomain;
import com.pointlion.common.core.page.TableSupport;
import com.pointlion.system.mapper.SysRoleMapper;
import com.pointlion.system.mapper.SysUserMapper;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.PNGTranscoder;
@@ -61,13 +61,13 @@ public class ActReModelService extends BaseService {
ModelQuery modelQuery = repositoryService.createModelQuery();
modelQuery.orderByLastUpdateTime().desc();
// 条件过滤
if (com.ruoyi.common.utils.StringUtils.isNotBlank(modelEntity.getKey())) {
if (com.pointlion.common.utils.StringUtils.isNotBlank(modelEntity.getKey())) {
modelQuery.modelKey(modelEntity.getKey());
}
if (com.ruoyi.common.utils.StringUtils.isNotBlank(modelEntity.getName())) {
if (com.pointlion.common.utils.StringUtils.isNotBlank(modelEntity.getName())) {
modelQuery.modelNameLike("%" + modelEntity.getName() + "%");
}
if (com.ruoyi.common.utils.StringUtils.isNotBlank(modelEntity.getCategory())) {
if (com.pointlion.common.utils.StringUtils.isNotBlank(modelEntity.getCategory())) {
modelQuery.modelCategory(modelEntity.getCategory());
}
PageDomain pageDomain = TableSupport.buildPageRequest();

219
PointLion/src/main/java/com/pointlion/back/oa/service/ActReProcdefService.java Normal file
View File

@@ -0,0 +1,219 @@
package com.pointlion.back.oa.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.github.pagehelper.Page;
import com.pointlion.back.oa.domain.ActReProcdef;
import com.pointlion.back.oa.mapper.ActReProcdefMapper;
import com.pointlion.common.core.page.PageDomain;
import com.pointlion.common.core.page.TableSupport;
import com.pointlion.common.core.text.Convert;
import com.pointlion.common.util.Base64Util;
import com.pointlion.common.utils.StringUtils;
import org.flowable.bpmn.converter.BpmnXMLConverter;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.editor.constants.ModelDataJsonConstants;
import org.flowable.editor.language.json.converter.BpmnJsonConverter;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntityImpl;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.Model;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.flowable.engine.runtime.ProcessInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.*;
import java.util.List;
import java.util.zip.ZipInputStream;
@Transactional
@Service
public class ActReProcdefService {
@Autowired
private RuntimeService runtimeService;
@Autowired
private RepositoryService repositoryService;
@Autowired
private ActReProcdefMapper actReProcdefMapper;
/**
* 分页查询流程定义文件
* @return
*/
public Page<ActReProcdef> listProcessDefinition(ActReProcdef actReProcdef) {
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
Page<ActReProcdef> list = new Page<>();
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery();
processDefinitionQuery.orderByProcessDefinitionId().orderByProcessDefinitionVersion().desc();
if (StringUtils.isNotBlank(actReProcdef.getName())) {
processDefinitionQuery.processDefinitionNameLike("%" + actReProcdef.getName() + "%");
}
if (StringUtils.isNotBlank(actReProcdef.getKey())) {
processDefinitionQuery.processDefinitionKeyLike("%" + actReProcdef.getKey() + "%");
}
if (StringUtils.isNotBlank(actReProcdef.getCategory())) {
processDefinitionQuery.processDefinitionCategoryLike("%" + actReProcdef.getCategory() + "%");
}
List<ProcessDefinition> processDefinitionList;
if (pageNum != null && pageSize != null) {
processDefinitionList = processDefinitionQuery.listPage((pageNum - 1) * pageSize, pageSize);
list.setTotal(processDefinitionQuery.count());
list.setPageNum(pageNum);
list.setPageSize(pageSize);
} else {
processDefinitionList = processDefinitionQuery.list();
}
for (ProcessDefinition definition: processDefinitionList) {
ProcessDefinitionEntityImpl entityImpl = (ProcessDefinitionEntityImpl) definition;
ActReProcdef entity = new ActReProcdef();
entity.setId(definition.getId());
entity.setKey(definition.getKey());
entity.setName(definition.getName());
entity.setCategory(definition.getCategory());
entity.setVersion(definition.getVersion());
entity.setDescription("null".equals(definition.getDescription())?"":definition.getDescription());
entity.setDeploymentId(definition.getDeploymentId());
Deployment deployment = repositoryService.createDeploymentQuery()
.deploymentId(definition.getDeploymentId())
.singleResult();
entity.setDeploymentTime(deployment.getDeploymentTime());
//repositoryService.getDeploymentResourceNames(definition.getDeploymentId());//获取所有资源的名称
entity.setDiagramResourceName(definition.getDiagramResourceName());
entity.setResourceName(definition.getResourceName());
entity.setSuspendState(entityImpl.getSuspensionState() + "");
if (entityImpl.getSuspensionState() == 1) {
entity.setSuspendStateName("已激活");
} else {
entity.setSuspendStateName("已挂起");
}
list.add(entity);
}
return list;
}
public void deployProcessDefinition(String filePath) throws FileNotFoundException {
if (StringUtils.isNotBlank(filePath)) {
if (filePath.endsWith(".zip")) {
ZipInputStream inputStream = new ZipInputStream(new FileInputStream(filePath));
repositoryService.createDeployment()
.addZipInputStream(inputStream)
.deploy();
} else if (filePath.endsWith(".bpmn")) {
repositoryService.createDeployment()
.addInputStream(filePath, new FileInputStream(filePath))
.deploy();
}
}
}
/*****
* 删除
* @param deploymentIds
* @return
* @throws Exception
*/
public int deleteProcessDeploymentByIds(String deploymentIds) throws Exception {
String[] deploymentIdsArr = Convert.toStrArray(deploymentIds);
int counter = 0;
for (String deploymentId: deploymentIdsArr) {
List<ProcessInstance> instanceList = runtimeService.createProcessInstanceQuery()
.deploymentId(deploymentId)
.list();
if (!CollectionUtils.isEmpty(instanceList)) {
// 存在流程实例的流程定义
throw new Exception("删除失败，存在运行中的流程实例");
}
repositoryService.deleteDeployment(deploymentId, true); // true 表示级联删除引用，比如 act_ru_execution 数据
counter++;
}
return counter;
}
/****
* 挂起和激活
* @param id
* @param suspendState
*/
public void suspendOrActiveApply(String id, String suspendState) {
if ("1".equals(suspendState)) {
// 当流程定义被挂起时，已经发起的该流程定义的流程实例不受影响（如果选择级联挂起则流程实例也会被挂起）。
// 当流程定义被挂起时，无法发起新的该流程定义的流程实例。
// 直观变化：act_re_procdef 的 SUSPENSION_STATE_ 为 2
repositoryService.suspendProcessDefinitionById(id);
} else if ("2".equals(suspendState)) {
repositoryService.activateProcessDefinitionById(id);
}
}
/****
* 读取流程资源
* @param processDefinitionId
* @param resourceName
* @return
*/
public String readResourceImg(String processDefinitionId, String resourceName) throws IOException {
ProcessDefinitionQuery pdq = repositoryService.createProcessDefinitionQuery();
ProcessDefinition pd = pdq.processDefinitionId(processDefinitionId).singleResult();
// 通过接口读取
InputStream resourceAsStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), resourceName);
ByteArrayOutputStream output = new ByteArrayOutputStream();
// 输出资源内容到相应对象
byte[] b = new byte[1024];
int len = -1;
while ((len = resourceAsStream.read(b, 0, 1024)) != -1) {
output.write(b, 0, len);
}
return Base64Util.byte2Base64(output.toByteArray());
}
/***
* 转化为模型
* @param processDefinitionId
* @throws UnsupportedEncodingException
* @throws XMLStreamException
*/
public void convertToModel(String processDefinitionId) throws UnsupportedEncodingException, XMLStreamException {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
.processDefinitionId(processDefinitionId).singleResult();
InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
processDefinition.getResourceName());
XMLInputFactory xif = XMLInputFactory.newInstance();
InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
XMLStreamReader xtr = xif.createXMLStreamReader(in);
BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
BpmnJsonConverter converter = new BpmnJsonConverter();
ObjectNode modelNode = converter.convertToJson(bpmnModel);
Model modelData = repositoryService.newModel();
modelData.setKey(processDefinition.getKey());
modelData.setName(processDefinition.getName());
modelData.setCategory(processDefinition.getCategory());//.getDeploymentId());
modelData.setDeploymentId(processDefinition.getDeploymentId());
modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
modelData.setMetaInfo(modelObjectNode.toString());
repositoryService.saveModel(modelData);
repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
}
public List<ActReProcdef> selectAllFlowList(){
return actReProcdefMapper.selectAllFlowList();
}
}

14
PointLion/src/main/java/com/ruoyi/back/oa/service/FlowImgService.java → PointLion/src/main/java/com/pointlion/back/oa/service/FlowImgService.java
View File

@@ -1,10 +1,9 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import com.ruoyi.back.erp.service.ActReProcdefService;
import com.ruoyi.back.erp.service.BaseService;
import com.ruoyi.common.constant.BillTypeEnum;
import com.ruoyi.common.util.Base64Util;
import com.ruoyi.back.oa.service.flowImg.CustomProcessDiagramGenerator;
import com.pointlion.common.service.base.BaseService;
import com.pointlion.common.constant.BillTypeEnum;
import com.pointlion.common.util.Base64Util;
import com.pointlion.back.oa.service.flowImg.CustomProcessDiagramGenerator;
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.FlowElement;
@@ -17,7 +16,6 @@ import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.image.ProcessDiagramGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -329,7 +327,7 @@ public class FlowImgService extends BaseService {
* @param billType
* @return
*/
public String getDefImgByBusinessId(String businessId,String billType) throws IOException {
public String getDefImgByBusinessId(Long businessId,String billType) throws IOException {
String imgStr = "";
String businessKey = billType+":"+BillTypeEnum.getTableName(billType)+":"+businessId;
List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).orderByProcessInstanceStartTime().desc().list();

120
PointLion/src/main/java/com/ruoyi/back/oa/service/FlowProcessInstanceService.java → PointLion/src/main/java/com/pointlion/back/oa/service/FlowProcessInstanceService.java
View File

@@ -1,15 +1,16 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.back.oa.mapper.FlowProcessMapper;
import com.ruoyi.common.constant.BillTypeEnum;
import com.ruoyi.common.constant.CommonConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.util.FlowUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.SysUserMapper;
import com.pointlion.back.oa.domain.FlowProcessInstance;
import com.pointlion.back.oa.mapper.FlowProcessMapper;
import com.pointlion.common.constant.BillTypeEnum;
import com.pointlion.common.constant.CommonConstants;
import com.pointlion.common.core.domain.entity.SysUser;
import com.pointlion.common.util.FlowUtil;
import com.pointlion.common.utils.SecurityUtils;
import com.pointlion.system.mapper.SysUserMapper;
import org.flowable.bpmn.model.EndEvent;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.bpmn.model.Process;
@@ -20,7 +21,6 @@ import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +48,104 @@ public class FlowProcessInstanceService {
private FlowProcessMapper flowProcessMapper;
@Autowired
private SysUserMapper sysUserMapper;
//@Autowired
//private OaDutyApplyService oaDutyApplyService;
//@Autowired
//private OaReimburseApplyService oaReimburseApplyService;
//@Autowired
//private OaCustomFormApplyService oaCustomFormApplyService;
//
//
//@Autowired
//private OaHotelApplyService oaHotelApplyService;
//@Autowired
//private OaMeetingroomApplyService oaMeetingroomApplyService;
//@Autowired
//private OaTicketApplyService oaTicketApplyService;
//@Autowired
//private OaCarApplyService oaCarApplyService;
//@Autowired
//private OaSealApplyService oaSealApplyService;
/*****
* 启动流程---入口，调用其他单据类型服务
* @param ins
*/
public void submitFlow(FlowProcessInstance ins ){
//假勤申请
//if(BillTypeEnum.DUTY_LEAVE.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OTHERCITYWORK.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OUT.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OVERTIME.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_REST.getBillType().equals(ins.getBillType())){
// oaDutyApplyService.submitFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.REIMBURSE.getBillType().equals(ins.getBillType())|| BillTypeEnum.REIMBURSE_BUS.getBillType().equals(ins.getBillType())){
// oaReimburseApplyService.submitFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.CUSTOM_FORM.getBillType().equals(ins.getBillType())){
// oaCustomFormApplyService.submitApply(ins.getBusinessId());
//}
//else if(BillTypeEnum.CAR_APPLY.getBillType().equals(ins.getBillType())){
// oaCarApplyService.submitFlow(ins.getBusinessId());
//}
//
//else if(BillTypeEnum.HOTEL_APPLY.getBillType().equals(ins.getBillType())){
// oaHotelApplyService.submitFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.MEETINGROOM_APPLY.getBillType().equals(ins.getBillType())){
// oaMeetingroomApplyService.submitFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.TICKET_APPLY.getBillType().equals(ins.getBillType())){
// oaTicketApplyService.submitFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.SEAL_APPLY.getBillType().equals(ins.getBillType())){
// oaSealApplyService.submitFlow(ins.getBusinessId());
//}
//else{
// throw new RuntimeException("未匹配到流程，请检查单据类型");
//}
}
/****
* 取回流程---入口调用其他单据类型服务
* @param ins
*/
public void cancleFlow(FlowProcessInstance ins ){
//假勤申请
//if(BillTypeEnum.DUTY_LEAVE.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OTHERCITYWORK.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OUT.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_OVERTIME.getBillType().equals(ins.getBillType())|| BillTypeEnum.DUTY_REST.getBillType().equals(ins.getBillType())){
// oaDutyApplyService.cancleFlow(ins.getBusinessId());
//}else if(BillTypeEnum.REIMBURSE.getBillType().equals(ins.getBillType())|| BillTypeEnum.REIMBURSE_BUS.getBillType().equals(ins.getBillType())){
// oaReimburseApplyService.cancleFlow(ins.getBusinessId());
//}else if(BillTypeEnum.CUSTOM_FORM.getBillType().equals(ins.getBillType())){
// oaCustomFormApplyService.cancleFlow(ins.getBusinessId());
//}else if(BillTypeEnum.CAR_APPLY.getBillType().equals(ins.getBillType())){
// oaCarApplyService.cancleFlow(ins.getBusinessId());
//}
//
//else if(BillTypeEnum.HOTEL_APPLY.getBillType().equals(ins.getBillType())){
// oaHotelApplyService.cancleFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.MEETINGROOM_APPLY.getBillType().equals(ins.getBillType())){
// oaMeetingroomApplyService.cancleFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.TICKET_APPLY.getBillType().equals(ins.getBillType())){
// oaTicketApplyService.cancleFlow(ins.getBusinessId());
//}
//else if(BillTypeEnum.SEAL_APPLY.getBillType().equals(ins.getBillType())){
// oaSealApplyService.cancleFlow(ins.getBusinessId());
//}
//else{
// throw new RuntimeException("未匹配到流程，请检查单据类型");
//}
}
/****
@@ -146,4 +244,8 @@ public class FlowProcessInstanceService {
}
}

9
PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdCarService.java → PointLion/src/main/java/com/pointlion/back/oa/service/OaBdCarService.java
View File

@@ -1,12 +1,11 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.pointlion.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.back.oa.mapper.OaBdCarMapper;
import com.ruoyi.back.oa.domain.OaBdCar;
import com.ruoyi.back.oa.service.OaBdCarService;
import com.pointlion.back.oa.mapper.OaBdCarMapper;
import com.pointlion.back.oa.domain.OaBdCar;
/**
* 车辆管理Service业务层处理

9
PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdMeetingroomService.java → PointLion/src/main/java/com/pointlion/back/oa/service/OaBdMeetingroomService.java
View File

@@ -1,12 +1,11 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.pointlion.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.back.oa.mapper.OaBdMeetingroomMapper;
import com.ruoyi.back.oa.domain.OaBdMeetingroom;
import com.ruoyi.back.oa.service.OaBdMeetingroomService;
import com.pointlion.back.oa.mapper.OaBdMeetingroomMapper;
import com.pointlion.back.oa.domain.OaBdMeetingroom;
/**
* 会议室管理Service业务层处理

9
PointLion/src/main/java/com/ruoyi/back/oa/service/OaBdSealService.java → PointLion/src/main/java/com/pointlion/back/oa/service/OaBdSealService.java
View File

@@ -1,12 +1,11 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.pointlion.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.back.oa.mapper.OaBdSealMapper;
import com.ruoyi.back.oa.domain.OaBdSeal;
import com.ruoyi.back.oa.service.OaBdSealService;
import com.pointlion.back.oa.mapper.OaBdSealMapper;
import com.pointlion.back.oa.domain.OaBdSeal;
/**
* 公章管理Service业务层处理

15
PointLion/src/main/java/com/ruoyi/back/oa/service/VTasklistService.java → PointLion/src/main/java/com/pointlion/back/oa/service/VTasklistService.java
View File

@@ -1,17 +1,16 @@
package com.ruoyi.back.oa.service;
package com.pointlion.back.oa.service;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.back.oa.domain.VTasklist;
import com.ruoyi.back.erp.service.BaseService;
import com.ruoyi.back.oa.mapper.VTasklistMapper;
import com.ruoyi.common.constant.BillTypeEnum;
import com.ruoyi.common.utils.StringUtils;
import com.pointlion.back.oa.domain.VTasklist;
import com.pointlion.common.service.base.BaseService;
import com.pointlion.back.oa.mapper.VTasklistMapper;
import com.pointlion.common.constant.BillTypeEnum;
import com.pointlion.common.utils.StringUtils;
import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.task.api.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -82,7 +81,7 @@ public class VTasklistService extends BaseService
* @param billType
* @return
*/
public List<VTasklist> getHisByBusinessId(String businessId,String billType){
public List<VTasklist> getHisByBusinessId(Long businessId,String billType){
List<VTasklist> result = new ArrayList<>();
String businessKey = billType+":"+ BillTypeEnum.getTableName(billType)+":"+businessId;
List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().processInstanceBusinessKey(businessKey).orderByProcessInstanceStartTime().asc().list();

2
PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramCanvas.java → PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramCanvas.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.service.flowImg;
package com.pointlion.back.oa.service.flowImg;
import org.flowable.bpmn.model.AssociationDirection;

2
PointLion/src/main/java/com/ruoyi/back/oa/service/flowImg/CustomProcessDiagramGenerator.java → PointLion/src/main/java/com/pointlion/back/oa/service/flowImg/CustomProcessDiagramGenerator.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.back.oa.service.flowImg;
package com.pointlion.back.oa.service.flowImg;
import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.*;

19
PointLion/src/main/java/com/ruoyi/common/constant/BillTypeEnum.java → PointLion/src/main/java/com/pointlion/common/constant/BillTypeEnum.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.common.constant;
package com.pointlion.common.constant;
/**
* @author Ly
* @Description 单据类型枚举类
@@ -21,11 +21,18 @@ public enum BillTypeEnum {
,SELL_OUT("sell_out","销售出库","pl_depot_bill","sell_out")
,SELL_BACK("sell_back","销售退货","pl_depot_bill","sell_back")
,DUTY_LEAVE("duty_leave","销售退货","oa_duty_apply","duty_leave")
,DUTY_REST("duty_rest","销售退货","oa_duty_apply","duty_rest")
,DUTY_OUT("duty_out","销售退货","oa_duty_apply","duty_out")
,DUTY_OVERTIME("duty_overtime","销售退货","oa_duty_apply","duty_overtime")
,DUTY_OTHERCITYWORK("duty_otherCityWork","销售退货","oa_duty_apply","duty_otherCityWork")
,DUTY_LEAVE("duty_leave","请假申请","oa_duty_apply","duty_leave")
,DUTY_REST("duty_rest","调休申请","oa_duty_apply","duty_rest")
,DUTY_OUT("duty_out","外出申请","oa_duty_apply","duty_out")
,DUTY_OVERTIME("duty_overtime","加班申请","oa_duty_apply","duty_overtime")
,DUTY_OTHERCITYWORK("duty_otherCityWork","出差申请","oa_duty_apply","duty_otherCityWork")
,CAR_APPLY("car_apply","车辆申请","oa_car_apply","car_apply")
,HOTEL_APPLY("hotel_apply","酒店申请","oa_hotel_apply","hotel_apply")
,MEETINGROOM_APPLY("meetingroom_apply","会议室申请","oa_meetingroom_apply","meetingroom_apply")
,TICKET_APPLY("ticket_apply","车票申请","oa_ticket_apply","ticket_apply")
,SEAL_APPLY("seal_apply","公章申请","oa_seal_apply","seal_apply")
, CUSTOM_FORM("custom_form","自定义申请表单","oa_custom_form_apply","custom_form");
/**

13
PointLion/src/main/java/com/ruoyi/common/constant/CommonConstants.java → PointLion/src/main/java/com/pointlion/common/constant/CommonConstants.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.common.constant;
package com.pointlion.common.constant;
/***
* @des
@@ -45,10 +45,19 @@ public class CommonConstants {
public static final String FLOW_FINISH_TYPE_REJECT = "reject";
/***
* 通用是、否
*/
public static final String YES = "Y";
public static final String NO = "N";
/***
* 通用可用、不可用
*/
public static final String ABLE = "0";
public static final String DISABLE = "1";
}

8
PointLion/src/main/java/com/ruoyi/common/controller/PointLionCommonController.java → PointLion/src/main/java/com/pointlion/common/controller/PointLionCommonController.java
View File

@@ -1,8 +1,8 @@
package com.ruoyi.common.controller;
package com.pointlion.common.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.service.ISysConfigService;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import com.pointlion.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;

118
PointLion/src/main/java/com/pointlion/common/controller/SerialController.java Normal file
View File

@@ -0,0 +1,118 @@
package com.pointlion.common.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.pointlion.common.annotation.Log;
import com.pointlion.common.core.controller.BaseController;
import com.pointlion.common.core.domain.AjaxResult;
import com.pointlion.common.enums.BusinessType;
import com.pointlion.common.domain.Serial;
import com.pointlion.common.service.SerialService;
import com.pointlion.common.utils.poi.ExcelUtil;
import com.pointlion.common.core.page.TableDataInfo;
/**
* 编号规则Controller
*
* @author pointLion
* @date 2022-10-29
*/
@RestController
@RequestMapping("/common/serial")
public class SerialController extends BaseController
{
@Autowired
private SerialService serialService;
/**
* 查询编号规则列表
*/
@PreAuthorize("@ss.hasPermi('common:serial:list')")
@GetMapping("/list")
public TableDataInfo list(Serial serial)
{
startPage();
List<Serial> list = serialService.selectSerialList(serial);
return getDataTable(list);
}
/**
* 导出编号规则列表
*/
@PreAuthorize("@ss.hasPermi('common:serial:export')")
@Log(title = "编号规则", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Serial serial)
{
List<Serial> list = serialService.selectSerialList(serial);
ExcelUtil<Serial> util = new ExcelUtil<Serial>(Serial.class);
util.exportExcel(response, list, "编号规则数据");
}
/**
* 获取编号规则详细信息
*/
@PreAuthorize("@ss.hasPermi('common:serial:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(serialService.selectSerialById(id));
}
/**
* 新增编号规则
*/
@PreAuthorize("@ss.hasPermi('common:serial:add')")
@Log(title = "编号规则", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Serial serial)
{
return toAjax(serialService.insertSerial(serial));
}
/**
* 修改编号规则
*/
@PreAuthorize("@ss.hasPermi('common:serial:edit')")
@Log(title = "编号规则", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Serial serial)
{
return toAjax(serialService.updateSerial(serial));
}
/**
* 删除编号规则
*/
@PreAuthorize("@ss.hasPermi('common:serial:remove')")
@Log(title = "编号规则", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(serialService.deleteSerialByIds(ids));
}
/****
*
* @param key
* @return
*/
@GetMapping("getSerialByKey/{key}")
public AjaxResult getSerialByKey(@PathVariable("key") String key){
return AjaxResult.success(serialService.getSerialByKey(key));
}
}

63
PointLion/src/main/java/com/pointlion/common/domain/Serial.java Normal file
View File

@@ -0,0 +1,63 @@
package com.pointlion.common.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.pointlion.common.annotation.Excel;
import com.pointlion.common.core.domain.BaseEntity;
/**
* 编号规则对象 pl_serial
*
* @author pointLion
* @date 2022-10-29
*/
@Data
public class Serial extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 单据类型 */
@Excel(name = "单据类型")
private String billType;
/** 序号 */
@Excel(name = "序号")
private Long serialNum;
/** 租户id */
@Excel(name = "租户id")
private Long tenantId;
/** 编号前缀 */
@Excel(name = "编号前缀")
private String prefix;
/** 是否包含日期 */
@Excel(name = "是否包含日期")
private String ifHaveDate;
/** 长度 */
@Excel(name = "长度")
private Long codeLength;
/** 最新的日期 **/
private String codeDate;
private String date;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("billType", getBillType())
.append("serialNum", getSerialNum())
.append("tenantId", getTenantId())
.append("prefix", getPrefix())
.append("ifHaveDate", getIfHaveDate())
.toString();
}
}

69
PointLion/src/main/java/com/pointlion/common/mapper/SerialMapper.java Normal file
View File

@@ -0,0 +1,69 @@
package com.pointlion.common.mapper;
import java.util.List;
import com.pointlion.common.domain.Serial;
/**
* 编号规则Mapper接口
*
* @author pointLion
* @date 2022-10-29
*/
public interface SerialMapper
{
/**
* 查询编号规则
*
* @param id 编号规则主键
* @return 编号规则
*/
public Serial selectSerialById(Long id);
/****
* 根据key获取编码规则
* @param key
* @return
*/
public Serial getSerialByKey(String key);
/**
* 查询编号规则列表
*
* @param serial 编号规则
* @return 编号规则集合
*/
public List<Serial> selectSerialList(Serial serial);
/**
* 新增编号规则
*
* @param serial 编号规则
* @return 结果
*/
public int insertSerial(Serial serial);
/**
* 修改编号规则
*
* @param serial 编号规则
* @return 结果
*/
public int updateSerial(Serial serial);
/**
* 删除编号规则
*
* @param id 编号规则主键
* @return 结果
*/
public int deleteSerialById(Long id);
/**
* 批量删除编号规则
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSerialByIds(Long[] ids);
}

167
PointLion/src/main/java/com/pointlion/common/service/SerialService.java Normal file
View File

@@ -0,0 +1,167 @@
package com.pointlion.common.service;
import java.util.Date;
import java.util.List;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.util.StrUtil;
import com.pointlion.common.constant.BillTypeEnum;
import com.pointlion.common.constant.CommonConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.pointlion.common.mapper.SerialMapper;
import com.pointlion.common.domain.Serial;
import org.springframework.transaction.annotation.Transactional;
/**
* 编号规则Service业务层处理
*
* @author pointLion
* @date 2022-10-29
*/
@Service
public class SerialService
{
@Autowired
private SerialMapper serialMapper;
/**
* 查询编号规则
*
* @param id 编号规则主键
* @return 编号规则
*/
public Serial selectSerialById(Long id)
{
return serialMapper.selectSerialById(id);
}
/**
* 查询编号规则列表
*
* @param serial 编号规则
* @return 编号规则
*/
public List<Serial> selectSerialList(Serial serial)
{
return serialMapper.selectSerialList(serial);
}
/**
* 新增编号规则
*
* @param serial 编号规则
* @return 结果
*/
public int insertSerial(Serial serial)
{
return serialMapper.insertSerial(serial);
}
/**
* 修改编号规则
*
* @param serial 编号规则
* @return 结果
*/
public int updateSerial(Serial serial)
{
return serialMapper.updateSerial(serial);
}
/**
* 批量删除编号规则
*
* @param ids 需要删除的编号规则主键
* @return 结果
*/
public int deleteSerialByIds(Long[] ids)
{
return serialMapper.deleteSerialByIds(ids);
}
/**
* 删除编号规则信息
*
* @param id 编号规则主键
* @return 结果
*/
public int deleteSerialById(Long id)
{
return serialMapper.deleteSerialById(id);
}
public void addSerialNum(String maxBarcode){
//更新
Serial serial = serialMapper.getSerialByKey(BillTypeEnum.MATERIAL.getBillType());
if(StrUtil.isNotBlank(maxBarcode)){
//判断是否有日期---截取日期的话，有可能会有问题
//if(CommonConstants.YES.equals(serial.getIfHaveDate())){
//
//}
String tail = maxBarcode.replace(serial.getPrefix(),"");
//用长度可能会改长度，会报错
String ret = tail.substring(tail.length()-serial.getCodeLength().intValue());
Long max = Long.parseLong(ret);
if(max>serial.getSerialNum()){
serial.setSerialNum(max);
serialMapper.updateSerial(serial);
}
}
}
/****
* 根据key获取编码规则
* @param key
* @return
*/
public Serial getSerialByKey(String key){
Serial serial = serialMapper.getSerialByKey(key);
if(CommonConstants.YES.equals(serial.getIfHaveDate())){
String date = DatePattern.PURE_DATE_FORMAT.format(new Date());
serial.setDate(date);
}
return serial;
}
/****
* 获取新的编号，并新增序号
* @param key
* @return
*/
@Transactional
public String generateBillCodeByBillType(String key){
Serial serial = serialMapper.getSerialByKey(key);
String code = "";
if(serial==null){
throw new RuntimeException("没有配置单据编码生成规则");
}
if(CommonConstants.YES.equals(serial.getIfHaveDate())){
//如果有日期，且日期不相同，则重置序号
String date = DatePattern.PURE_DATE_FORMAT.format(new Date());
if(StrUtil.isBlank(serial.getCodeDate()) && !date.equals(serial.getCodeDate())){
//重置序号
code = StrUtil.fillBefore("1", '0',serial.getCodeLength().intValue());
//设置下一个序号
serial.setSerialNum(new Long(2));
}else{
code = StrUtil.fillBefore(serial.getSerialNum()+"", '0',serial.getCodeLength().intValue());
//设置下一个序号
serial.setSerialNum(serial.getSerialNum()+1);
}
code = serial.getPrefix() + date + code.substring(date.length());
//更新最新日期
serial.setCodeDate(date);
}else{
code = serial.getPrefix() + StrUtil.fillBefore(serial.getSerialNum()+"", '0',serial.getCodeLength().intValue());
serial.setSerialNum(serial.getSerialNum()+1);
}
serialMapper.updateSerial(serial);
return code;
}
}

14
PointLion/src/main/java/com/pointlion/common/service/base/BaseService.java Normal file
View File

@@ -0,0 +1,14 @@
package com.pointlion.common.service.base;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/***
* @des
* @author Ly
* @date 2022/7/8
*/
public class BaseService {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
}

2
PointLion/src/main/java/com/ruoyi/common/util/Base64Util.java → PointLion/src/main/java/com/pointlion/common/util/Base64Util.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.common.util;
package com.pointlion.common.util;
import java.util.Base64;

2
PointLion/src/main/java/com/ruoyi/common/util/CustomXMLWorkerFontProvider.java → PointLion/src/main/java/com/pointlion/common/util/CustomXMLWorkerFontProvider.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.common.util;
package com.pointlion.common.util;
import com.itextpdf.text.BaseColor;

6
PointLion/src/main/java/com/ruoyi/common/util/FlowUtil.java → PointLion/src/main/java/com/pointlion/common/util/FlowUtil.java
View File

@@ -1,9 +1,7 @@
package com.ruoyi.common.util;
package com.pointlion.common.util;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import com.ruoyi.common.constant.CommonConstants;
import org.flowable.engine.runtime.ProcessInstance;
import com.pointlion.common.constant.CommonConstants;
import java.util.HashMap;
import java.util.Map;

2
PointLion/src/main/java/com/ruoyi/common/util/OfficeUtil.java → PointLion/src/main/java/com/pointlion/common/util/OfficeUtil.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.common.util;
package com.pointlion.common.util;
import com.itextpdf.text.Document;
import com.itextpdf.text.pdf.PdfWriter;

6
PointLion/src/main/java/com/ruoyi/common/util/RenameFileMain.java → PointLion/src/main/java/com/pointlion/common/util/RenameFileMain.java
View File

@@ -1,12 +1,8 @@
package com.ruoyi.common.util;
package com.pointlion.common.util;
import cn.hutool.core.io.FileUtil;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
/***
* @des

149
PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementController.java
View File

@@ -1,149 +0,0 @@
package com.ruoyi.back.ct.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.ct.domain.CtAgreement;
import com.ruoyi.back.ct.service.CtAgreementService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 补充协议Controller
*
* @author pointLion
* @date 2023-05-13
*/
@RestController
@RequestMapping("/ct/agreement")
public class CtAgreementController extends BaseController
{
@Autowired
private CtAgreementService ctAgreementService;
/**
* 查询补充协议列表
*/
@PreAuthorize("@ss.hasPermi('ct:agreement:list')")
@GetMapping("/list")
public TableDataInfo list(CtAgreement ctAgreement)
{
startPage();
List<CtAgreement> list = ctAgreementService.selectCtAgreementList(ctAgreement);
return getDataTable(list);
}
/**
* 导出补充协议列表
*/
@PreAuthorize("@ss.hasPermi('ct:agreement:export')")
@Log(title = "补充协议", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CtAgreement ctAgreement)
{
List<CtAgreement> list = ctAgreementService.selectCtAgreementList(ctAgreement);
ExcelUtil<CtAgreement> util = new ExcelUtil<CtAgreement>(CtAgreement.class);
util.exportExcel(response, list, "补充协议数据");
}
/**
* 获取补充协议详细信息
*/
@PreAuthorize("@ss.hasPermi('ct:agreement:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(ctAgreementService.selectCtAgreementById(id));
}
/**
* 新增补充协议
*/
@PreAuthorize("@ss.hasPermi('ct:agreement:add')")
@Log(title = "补充协议", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CtAgreement ctAgreement)
{
ctAgreement.setCreateBy(getLoginUser().getUsername());
return toAjax(ctAgreementService.insertCtAgreement(ctAgreement));
}
/**
* 修改补充协议
*/
@PreAuthorize("@ss.hasPermi('ct:agreement:edit')")
@Log(title = "补充协议", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CtAgreement ctAgreement)
{
ctAgreement.setUpdateBy(getLoginUser().getUsername());
return toAjax(ctAgreementService.updateCtAgreement(ctAgreement));
}
/**
* 删除补充协议
*/
@PreAuthorize("@ss.hasPermi('ct:agreement:remove')")
@Log(title = "补充协议", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(ctAgreementService.deleteCtAgreementByIds(ids));
}
/*****
* 预览
* @param id
* @return
*/
@RequestMapping("/previewAgreemwnt")
public AjaxResult previewAgreemwnt(@RequestParam(name = "id")Long id){
String content = ctAgreementService.buildAgreementContent(id);
return success("成功",content);
}
/****
* 生成文件
* @param id
* @return
* @throws Exception
*/
@RequestMapping("/buildFile/{id}")
public AjaxResult buildFile(@PathVariable("id")Long id) throws Exception {
ctAgreementService.buildFile(id);
return success();
}
/*****
* 提交流程
* @param id
* @return
* @throws Exception
*/
@RequestMapping("/submitFlow/{id}")
public AjaxResult submitFlow(@PathVariable("id")Long id) throws Exception {
ctAgreementService.submitFlow(id);
return success();
}
/*****
* 取回流程
* @param id
* @return
* @throws Exception
*/
@RequestMapping("/cancleFlow/{id}")
public AjaxResult cancleFlow(@PathVariable("id")Long id) throws Exception {
ctAgreementService.cancleFlow(id);
return success();
}
}

104
PointLion/src/main/java/com/ruoyi/back/ct/controller/CtAgreementTplController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.ct.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.ct.domain.CtAgreementTpl;
import com.ruoyi.back.ct.service.CtAgreementTplService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 协议模版Controller
*
* @author pointLion
* @date 2023-05-13
*/
@RestController
@RequestMapping("/ct/agreementTpl")
public class CtAgreementTplController extends BaseController
{
@Autowired
private CtAgreementTplService ctAgreementTplService;
/**
* 查询协议模版列表
*/
@PreAuthorize("@ss.hasPermi('ct:agreementTpl:list')")
@GetMapping("/list")
public TableDataInfo list(CtAgreementTpl ctAgreementTpl)
{
startPage();
List<CtAgreementTpl> list = ctAgreementTplService.selectCtAgreementTplList(ctAgreementTpl);
return getDataTable(list);
}
/**
* 导出协议模版列表
*/
@PreAuthorize("@ss.hasPermi('ct:agreementTpl:export')")
@Log(title = "协议模版", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CtAgreementTpl ctAgreementTpl)
{
List<CtAgreementTpl> list = ctAgreementTplService.selectCtAgreementTplList(ctAgreementTpl);
ExcelUtil<CtAgreementTpl> util = new ExcelUtil<CtAgreementTpl>(CtAgreementTpl.class);
util.exportExcel(response, list, "协议模版数据");
}
/**
* 获取协议模版详细信息
*/
@PreAuthorize("@ss.hasPermi('ct:agreementTpl:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(ctAgreementTplService.selectCtAgreementTplById(id));
}
/**
* 新增协议模版
*/
@PreAuthorize("@ss.hasPermi('ct:agreementTpl:add')")
@Log(title = "协议模版", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CtAgreementTpl ctAgreementTpl)
{
return toAjax(ctAgreementTplService.insertCtAgreementTpl(ctAgreementTpl));
}
/**
* 修改协议模版
*/
@PreAuthorize("@ss.hasPermi('ct:agreementTpl:edit')")
@Log(title = "协议模版", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CtAgreementTpl ctAgreementTpl)
{
return toAjax(ctAgreementTplService.updateCtAgreementTpl(ctAgreementTpl));
}
/**
* 删除协议模版
*/
@PreAuthorize("@ss.hasPermi('ct:agreementTpl:remove')")
@Log(title = "协议模版", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(ctAgreementTplService.deleteCtAgreementTplByIds(ids));
}
}

207
PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreement.java
View File

@@ -1,207 +0,0 @@
package com.ruoyi.back.ct.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 补充协议对象 ct_agreement
*
* @author pointLion
* @date 2023-05-13
*/
@Data
public class CtAgreement extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 合同编号 */
@Excel(name = "合同编号")
private String contractNo;
/** 协议名称 */
@Excel(name = "协议名称")
private String contractName;
/** 签约地点 */
@Excel(name = "签约地点")
private String signAddr;
/** 最低保证金 */
@Excel(name = "最低保证金")
private BigDecimal lowBond;
/** 挂账方式 */
@Excel(name = "挂账方式")
private String gzType;
/** 支付方式 */
@Excel(name = "支付方式")
private String payType;
/** 应付款 */
@Excel(name = "应付款")
private BigDecimal needCharge;
/** 预付款 */
@Excel(name = "预付款")
private BigDecimal advanceCharge;
/** 协议价格 */
@Excel(name = "协议价格")
private BigDecimal agreementAmt;
/** 材质 */
@Excel(name = "材质")
private String material;
/** 参考价 */
@Excel(name = "参考价")
private BigDecimal referencePrice;
/** 定价基准 */
@Excel(name = "定价基准")
private String pricingBenchmark;
/** 补充 */
@Excel(name = "补充")
private String other;
/** 甲方编码 */
@Excel(name = "甲方编码")
private String orgNo;
/** 甲方名称 */
@Excel(name = "甲方名称")
private String orgName;
/** 甲方法人 */
@Excel(name = "甲方法人")
private String orgFr;
/** 甲方地址 */
@Excel(name = "甲方地址")
private String orgAddr;
/** 甲方委托代理人 */
@Excel(name = "甲方委托代理人")
private String orgWtr;
/** 甲方电话 */
@Excel(name = "甲方电话")
private String orgTel;
/** 甲方签证 */
@Excel(name = "甲方签证")
private String okDt;
/** 乙方编码 */
@Excel(name = "乙方编码")
private String supplyNo;
/** 乙方名称 */
@Excel(name = "乙方名称")
private String supplyName;
/** 乙方法人 */
@Excel(name = "乙方法人")
private String spFr;
/** 乙方地址 */
@Excel(name = "乙方地址")
private String spAddr;
/** 乙方委托人 */
@Excel(name = "乙方委托人")
private String spWtr;
/** 乙方电话 */
@Excel(name = "乙方电话")
private String spTel;
/** 乙方签证 */
private String spOkDt;
/** 申请流程 */
@Excel(name = "申请流程")
private String flowKey;
/** 流程名称 */
@Excel(name = "流程名称")
private String flowName;
/** 流程实例id */
@Excel(name = "流程实例id")
private String flowInsId;
/** 状态 */
@Excel(name = "状态", readConverterExp = "0=未提交,1=已提交,2=已完成")
private String status;
/** 提交时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date submitTime;
private Long tplId;
private String tplName;
private String url;
private Date byTime;
//是否预警
private Integer ifNotice;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("contractNo", getContractNo())
.append("contractName", getContractName())
.append("signAddr", getSignAddr())
.append("lowBond", getLowBond())
.append("gzType", getGzType())
.append("payType", getPayType())
.append("needCharge", getNeedCharge())
.append("advanceCharge", getAdvanceCharge())
.append("agreementAmt", getAgreementAmt())
.append("material", getMaterial())
.append("referencePrice", getReferencePrice())
.append("pricingBenchmark", getPricingBenchmark())
.append("other", getOther())
.append("orgNo", getOrgNo())
.append("orgName", getOrgName())
.append("orgFr", getOrgFr())
.append("orgAddr", getOrgAddr())
.append("orgWtr", getOrgWtr())
.append("orgTel", getOrgTel())
.append("okDt", getOkDt())
.append("supplyNo", getSupplyNo())
.append("supplyName", getSupplyName())
.append("spFr", getSpFr())
.append("spAddr", getSpAddr())
.append("spWtr", getSpWtr())
.append("spTel", getSpTel())
.append("spOkDt", getSpOkDt())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

49
PointLion/src/main/java/com/ruoyi/back/ct/domain/CtAgreementTpl.java
View File

@@ -1,49 +0,0 @@
package com.ruoyi.back.ct.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 协议模版对象 ct_agreement_tpl
*
* @author pointLion
* @date 2023-05-13
*/
@Data
public class CtAgreementTpl extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 模版名称 */
@Excel(name = "模版名称")
private String name;
/** 模版内容 */
private String content;
/** 文件地址 */
@Excel(name = "文件地址")
private String url;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("content", getContent())
.append("url", getUrl())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

61
PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.ct.mapper;
import java.util.List;
import com.ruoyi.back.ct.domain.CtAgreement;
/**
* 补充协议Mapper接口
*
* @author pointLion
* @date 2023-05-13
*/
public interface CtAgreementMapper
{
/**
* 查询补充协议
*
* @param id 补充协议主键
* @return 补充协议
*/
public CtAgreement selectCtAgreementById(Long id);
/**
* 查询补充协议列表
*
* @param ctAgreement 补充协议
* @return 补充协议集合
*/
public List<CtAgreement> selectCtAgreementList(CtAgreement ctAgreement);
/**
* 新增补充协议
*
* @param ctAgreement 补充协议
* @return 结果
*/
public int insertCtAgreement(CtAgreement ctAgreement);
/**
* 修改补充协议
*
* @param ctAgreement 补充协议
* @return 结果
*/
public int updateCtAgreement(CtAgreement ctAgreement);
/**
* 删除补充协议
*
* @param id 补充协议主键
* @return 结果
*/
public int deleteCtAgreementById(Long id);
/**
* 批量删除补充协议
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCtAgreementByIds(Long[] ids);
}

61
PointLion/src/main/java/com/ruoyi/back/ct/mapper/CtAgreementTplMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.ct.mapper;
import java.util.List;
import com.ruoyi.back.ct.domain.CtAgreementTpl;
/**
* 协议模版Mapper接口
*
* @author pointLion
* @date 2023-05-13
*/
public interface CtAgreementTplMapper
{
/**
* 查询协议模版
*
* @param id 协议模版主键
* @return 协议模版
*/
public CtAgreementTpl selectCtAgreementTplById(Long id);
/**
* 查询协议模版列表
*
* @param ctAgreementTpl 协议模版
* @return 协议模版集合
*/
public List<CtAgreementTpl> selectCtAgreementTplList(CtAgreementTpl ctAgreementTpl);
/**
* 新增协议模版
*
* @param ctAgreementTpl 协议模版
* @return 结果
*/
public int insertCtAgreementTpl(CtAgreementTpl ctAgreementTpl);
/**
* 修改协议模版
*
* @param ctAgreementTpl 协议模版
* @return 结果
*/
public int updateCtAgreementTpl(CtAgreementTpl ctAgreementTpl);
/**
* 删除协议模版
*
* @param id 协议模版主键
* @return 结果
*/
public int deleteCtAgreementTplById(Long id);
/**
* 批量删除协议模版
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCtAgreementTplByIds(Long[] ids);
}

234
PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementService.java
View File

@@ -1,234 +0,0 @@
package com.ruoyi.back.ct.service;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.List;
import java.util.Map;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.back.ct.domain.CtAgreementTpl;
import com.ruoyi.back.ct.mapper.CtAgreementTplMapper;
import com.ruoyi.back.oa.domain.OaCustomFormApply;
import com.ruoyi.back.oa.service.FlowProcessInstanceService;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.BillTypeEnum;
import com.ruoyi.common.constant.CommonConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.util.FlowUtil;
import com.ruoyi.common.util.OfficeUtil;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.mapper.SysUserMapper;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.back.ct.mapper.CtAgreementMapper;
import com.ruoyi.back.ct.domain.CtAgreement;
import org.springframework.transaction.annotation.Transactional;
/**
* 补充协议Service业务层处理
*
* @author pointLion
* @date 2023-05-13
*/
@Service
public class CtAgreementService
{
@Autowired
private CtAgreementMapper ctAgreementMapper;
@Autowired
private CtAgreementTplMapper ctAgreementTplMapper;
@Autowired
private RuntimeService runtimeService;
@Autowired
private HistoryService historyService;
@Autowired
private FlowProcessInstanceService flowProcessInstanceService;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
private CtAgreementService ctAgreementService;
/**
* 查询补充协议
*
* @param id 补充协议主键
* @return 补充协议
*/
public CtAgreement selectCtAgreementById(Long id)
{
return ctAgreementMapper.selectCtAgreementById(id);
}
/**
* 查询补充协议列表
*
* @param ctAgreement 补充协议
* @return 补充协议
*/
public List<CtAgreement> selectCtAgreementList(CtAgreement ctAgreement)
{
List<CtAgreement> list = ctAgreementMapper.selectCtAgreementList(ctAgreement);
for(CtAgreement a:list){
a.setIfNotice(DateUtil.compare(a.getByTime(),DateUtils.parseDate(DateUtils.getDate())));
}
return list;
}
/**
* 新增补充协议
*
* @param ctAgreement 补充协议
* @return 结果
*/
public int insertCtAgreement(CtAgreement ctAgreement)
{
ctAgreement.setCreateTime(DateUtils.getNowDate());
return ctAgreementMapper.insertCtAgreement(ctAgreement);
}
/**
* 修改补充协议
*
* @param ctAgreement 补充协议
* @return 结果
*/
public int updateCtAgreement(CtAgreement ctAgreement)
{
ctAgreement.setUpdateTime(DateUtils.getNowDate());
return ctAgreementMapper.updateCtAgreement(ctAgreement);
}
/**
* 批量删除补充协议
*
* @param ids 需要删除的补充协议主键
* @return 结果
*/
public int deleteCtAgreementByIds(Long[] ids)
{
return ctAgreementMapper.deleteCtAgreementByIds(ids);
}
/**
* 删除补充协议信息
*
* @param id 补充协议主键
* @return 结果
*/
public int deleteCtAgreementById(Long id)
{
return ctAgreementMapper.deleteCtAgreementById(id);
}
/*****
* 预览
* @param id
* @return
*/
public String buildAgreementContent(Long id){
CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id);
String content = buildContent(agreement);
return content;
}
private String buildContent(CtAgreement agreement ){
String content = "";
CtAgreementTpl tpl = ctAgreementTplMapper.selectCtAgreementTplById(agreement.getTplId());
if(tpl!=null){
content = tpl.getContent();
Field[] fields = agreement.getClass().getDeclaredFields();
for(Field f:fields){
String fieldName = f.getName();
String name = fieldName.substring(0,1).toUpperCase()+fieldName.substring(1);
try {
if(!"serialVersionUID".equals(fieldName)){
Method m = agreement.getClass().getMethod("get"+name);
Object obj = m.invoke(agreement);
if(obj!=null){
content = content.replace("{{"+f.getName()+"}}",obj.toString());
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
return content;
}
/*****
* 生成文件
*/
public void buildFile(Long id) throws Exception {
CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id);
String content = buildContent(agreement);
String path = RuoYiConfig.getProfile()+"/office/ct";
File folder = new File(path);
if(!folder.exists()){
folder.mkdirs();
}
String rPath = "/office/ct/"+agreement.getContractName()+".doc";
String realPath = RuoYiConfig.getProfile()+rPath;
OfficeUtil.createWordByHtml(content,realPath);
agreement.setUrl(Constants.RESOURCE_PREFIX+rPath);
ctAgreementMapper.updateCtAgreement(agreement);
}
/****
* 提交流程
* @param id
*/
@Transactional
public void submitFlow(Long id){
CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id);
ProcessInstance procIns = flowProcessInstanceService.startProcess(id,agreement.getContractName(), BillTypeEnum.AGREEMENT.getBillType());
CtAgreement updateAgreement = new CtAgreement();
updateAgreement.setId(agreement.getId());
updateAgreement.setFlowInsId(procIns.getId());
updateAgreement.setFlowKey(BillTypeEnum.AGREEMENT.getDefKey());
updateAgreement.setFlowName(procIns.getProcessDefinitionName());
updateAgreement.setStatus(CommonConstants.FLOW_STATUS_SUBMIT);//更新状态
updateAgreement.setUpdateTime(new Date());
updateAgreement.setSubmitTime(new Date());
ctAgreementMapper.updateCtAgreement(updateAgreement);
}
/****
* 取回流程
* @param id
*/
public void cancleFlow(Long id){
CtAgreement agreement = ctAgreementMapper.selectCtAgreementById(id);
String insId = agreement.getFlowInsId();
if(StrUtil.isNotBlank(insId)){
flowProcessInstanceService.cancleProcesInstance(insId,"用户撤销");
}
CtAgreement updateAgreement = new CtAgreement();
updateAgreement.setId(id);
updateAgreement.setStatus(CommonConstants.FLOW_STATUS_START);
updateAgreement.setFlowInsId("");
updateAgreement.setFlowKey("");
updateAgreement.setFlowName("");
updateAgreement.setUpdateTime(new Date());
ctAgreementMapper.updateCtAgreement(updateAgreement);
}
}

89
PointLion/src/main/java/com/ruoyi/back/ct/service/CtAgreementTplService.java
View File

@@ -1,89 +0,0 @@
package com.ruoyi.back.ct.service;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.back.ct.mapper.CtAgreementTplMapper;
import com.ruoyi.back.ct.domain.CtAgreementTpl;
/**
* 协议模版Service业务层处理
*
* @author pointLion
* @date 2023-05-13
*/
@Service
public class CtAgreementTplService
{
@Autowired
private CtAgreementTplMapper ctAgreementTplMapper;
/**
* 查询协议模版
*
* @param id 协议模版主键
* @return 协议模版
*/
public CtAgreementTpl selectCtAgreementTplById(Long id)
{
return ctAgreementTplMapper.selectCtAgreementTplById(id);
}
/**
* 查询协议模版列表
*
* @param ctAgreementTpl 协议模版
* @return 协议模版
*/
public List<CtAgreementTpl> selectCtAgreementTplList(CtAgreementTpl ctAgreementTpl)
{
return ctAgreementTplMapper.selectCtAgreementTplList(ctAgreementTpl);
}
/**
* 新增协议模版
*
* @param ctAgreementTpl 协议模版
* @return 结果
*/
public int insertCtAgreementTpl(CtAgreementTpl ctAgreementTpl)
{
ctAgreementTpl.setCreateTime(DateUtils.getNowDate());
return ctAgreementTplMapper.insertCtAgreementTpl(ctAgreementTpl);
}
/**
* 修改协议模版
*
* @param ctAgreementTpl 协议模版
* @return 结果
*/
public int updateCtAgreementTpl(CtAgreementTpl ctAgreementTpl)
{
ctAgreementTpl.setUpdateTime(DateUtils.getNowDate());
return ctAgreementTplMapper.updateCtAgreementTpl(ctAgreementTpl);
}
/**
* 批量删除协议模版
*
* @param ids 需要删除的协议模版主键
* @return 结果
*/
public int deleteCtAgreementTplByIds(Long[] ids)
{
return ctAgreementTplMapper.deleteCtAgreementTplByIds(ids);
}
/**
* 删除协议模版信息
*
* @param id 协议模版主键
* @return 结果
*/
public int deleteCtAgreementTplById(Long id)
{
return ctAgreementTplMapper.deleteCtAgreementTplById(id);
}
}

27
PointLion/src/main/java/com/ruoyi/back/oa/controller/ActProcessInsController.java
View File

@@ -1,27 +0,0 @@
package com.ruoyi.back.oa.controller;
import com.ruoyi.back.oa.service.FlowProcessInstanceService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/***
* @des
* @author Ly
* @date 2023/5/31
*/
@RestController
@RequestMapping("/oa/processInstance")
public class ActProcessInsController extends BaseController {
@Autowired
private FlowProcessInstanceService flowProcessInstanceService;
@RequestMapping("/deleteAllProcessInstance")
public AjaxResult deleteAllProcessInstance(){
flowProcessInstanceService.deleteAllProcessInstance();
return success();
}
}

104
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdCarController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaBdCar;
import com.ruoyi.back.oa.service.OaBdCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 车辆管理Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/car")
public class OaBdCarController extends BaseController
{
@Autowired
private OaBdCarService oaBdCarService;
/**
* 查询车辆管理列表
*/
@PreAuthorize("@ss.hasPermi('oa:car:list')")
@GetMapping("/list")
public TableDataInfo list(OaBdCar oaBdCar)
{
startPage();
List<OaBdCar> list = oaBdCarService.selectOaBdCarList(oaBdCar);
return getDataTable(list);
}
/**
* 导出车辆管理列表
*/
@PreAuthorize("@ss.hasPermi('oa:car:export')")
@Log(title = "车辆管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaBdCar oaBdCar)
{
List<OaBdCar> list = oaBdCarService.selectOaBdCarList(oaBdCar);
ExcelUtil<OaBdCar> util = new ExcelUtil<OaBdCar>(OaBdCar.class);
util.exportExcel(response, list, "车辆管理数据");
}
/**
* 获取车辆管理详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:car:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaBdCarService.selectOaBdCarById(id));
}
/**
* 新增车辆管理
*/
@PreAuthorize("@ss.hasPermi('oa:car:add')")
@Log(title = "车辆管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaBdCar oaBdCar)
{
return toAjax(oaBdCarService.insertOaBdCar(oaBdCar));
}
/**
* 修改车辆管理
*/
@PreAuthorize("@ss.hasPermi('oa:car:edit')")
@Log(title = "车辆管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaBdCar oaBdCar)
{
return toAjax(oaBdCarService.updateOaBdCar(oaBdCar));
}
/**
* 删除车辆管理
*/
@PreAuthorize("@ss.hasPermi('oa:car:remove')")
@Log(title = "车辆管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaBdCarService.deleteOaBdCarByIds(ids));
}
}

104
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdMeetingroomController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaBdMeetingroom;
import com.ruoyi.back.oa.service.OaBdMeetingroomService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 会议室管理Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/meetingroom")
public class OaBdMeetingroomController extends BaseController
{
@Autowired
private OaBdMeetingroomService oaBdMeetingroomService;
/**
* 查询会议室管理列表
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroom:list')")
@GetMapping("/list")
public TableDataInfo list(OaBdMeetingroom oaBdMeetingroom)
{
startPage();
List<OaBdMeetingroom> list = oaBdMeetingroomService.selectOaBdMeetingroomList(oaBdMeetingroom);
return getDataTable(list);
}
/**
* 导出会议室管理列表
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroom:export')")
@Log(title = "会议室管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaBdMeetingroom oaBdMeetingroom)
{
List<OaBdMeetingroom> list = oaBdMeetingroomService.selectOaBdMeetingroomList(oaBdMeetingroom);
ExcelUtil<OaBdMeetingroom> util = new ExcelUtil<OaBdMeetingroom>(OaBdMeetingroom.class);
util.exportExcel(response, list, "会议室管理数据");
}
/**
* 获取会议室管理详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroom:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaBdMeetingroomService.selectOaBdMeetingroomById(id));
}
/**
* 新增会议室管理
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroom:add')")
@Log(title = "会议室管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaBdMeetingroom oaBdMeetingroom)
{
return toAjax(oaBdMeetingroomService.insertOaBdMeetingroom(oaBdMeetingroom));
}
/**
* 修改会议室管理
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroom:edit')")
@Log(title = "会议室管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaBdMeetingroom oaBdMeetingroom)
{
return toAjax(oaBdMeetingroomService.updateOaBdMeetingroom(oaBdMeetingroom));
}
/**
* 删除会议室管理
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroom:remove')")
@Log(title = "会议室管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaBdMeetingroomService.deleteOaBdMeetingroomByIds(ids));
}
}

104
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaBdSealController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaBdSeal;
import com.ruoyi.back.oa.service.OaBdSealService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 公章管理Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/seal")
public class OaBdSealController extends BaseController
{
@Autowired
private OaBdSealService oaBdSealService;
/**
* 查询公章管理列表
*/
@PreAuthorize("@ss.hasPermi('oa:seal:list')")
@GetMapping("/list")
public TableDataInfo list(OaBdSeal oaBdSeal)
{
startPage();
List<OaBdSeal> list = oaBdSealService.selectOaBdSealList(oaBdSeal);
return getDataTable(list);
}
/**
* 导出公章管理列表
*/
@PreAuthorize("@ss.hasPermi('oa:seal:export')")
@Log(title = "公章管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaBdSeal oaBdSeal)
{
List<OaBdSeal> list = oaBdSealService.selectOaBdSealList(oaBdSeal);
ExcelUtil<OaBdSeal> util = new ExcelUtil<OaBdSeal>(OaBdSeal.class);
util.exportExcel(response, list, "公章管理数据");
}
/**
* 获取公章管理详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:seal:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaBdSealService.selectOaBdSealById(id));
}
/**
* 新增公章管理
*/
@PreAuthorize("@ss.hasPermi('oa:seal:add')")
@Log(title = "公章管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaBdSeal oaBdSeal)
{
return toAjax(oaBdSealService.insertOaBdSeal(oaBdSeal));
}
/**
* 修改公章管理
*/
@PreAuthorize("@ss.hasPermi('oa:seal:edit')")
@Log(title = "公章管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaBdSeal oaBdSeal)
{
return toAjax(oaBdSealService.updateOaBdSeal(oaBdSeal));
}
/**
* 删除公章管理
*/
@PreAuthorize("@ss.hasPermi('oa:seal:remove')")
@Log(title = "公章管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaBdSealService.deleteOaBdSealByIds(ids));
}
}

133
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormApplyController.java
View File

@@ -1,133 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaCustomFormApply;
import com.ruoyi.back.oa.service.OaCustomFormApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 自定义表单申请Controller
*
* @author pointLion
* @date 2022-07-09
*/
@RestController
@RequestMapping("/oa/myApply")
public class OaCustomFormApplyController extends BaseController
{
@Autowired
private OaCustomFormApplyService oaCustomFormApplyService;
/**
* 查询自定义表单申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:list')")
@GetMapping("/list")
public TableDataInfo list(OaCustomFormApply oaCustomFormApply)
{
startPage();
List<OaCustomFormApply> list = oaCustomFormApplyService.selectOaCustomFormApplyList(oaCustomFormApply);
return getDataTable(list);
}
/**
* 导出自定义表单申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:export')")
@Log(title = "自定义表单申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaCustomFormApply oaCustomFormApply)
{
List<OaCustomFormApply> list = oaCustomFormApplyService.selectOaCustomFormApplyList(oaCustomFormApply);
ExcelUtil<OaCustomFormApply> util = new ExcelUtil<OaCustomFormApply>(OaCustomFormApply.class);
util.exportExcel(response, list, "自定义表单申请数据");
}
/**
* 获取自定义表单申请详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaCustomFormApplyService.selectOaCustomFormApplyById(id));
}
/**
* 新增自定义表单申请
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:add')")
@Log(title = "自定义表单申请", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaCustomFormApply oaCustomFormApply)
{
return AjaxResult.success("保存成功", oaCustomFormApplyService.insertOaCustomFormApply(oaCustomFormApply,getLoginUser()));
}
/**
* 修改自定义表单申请
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:edit')")
@Log(title = "自定义表单申请", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaCustomFormApply oaCustomFormApply)
{
return toAjax(oaCustomFormApplyService.updateOaCustomFormApply(oaCustomFormApply, getLoginUser()));
}
/**
* 删除自定义表单申请
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:remove')")
@Log(title = "自定义表单申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaCustomFormApplyService.deleteOaCustomFormApplyByIds(ids));
}
/****
* 撤销申请
* @param id
* @return
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:remove')")
@Log(title = "撤销申请", businessType = BusinessType.DELETE)
@PostMapping("/cancelApplyInsId/{id}")
public AjaxResult cancelApplyInsId(@PathVariable("id") Long id){
oaCustomFormApplyService.cancelApplyInsId(id,"用户撤销");
return success();
}
/****
* 撤销申请
* @param id
* @return
*/
@PreAuthorize("@ss.hasPermi('oa:myApply:edit')")
@Log(title = "提交申请", businessType = BusinessType.SUBMIT)
@PostMapping("/submitApply/{id}")
public AjaxResult submitApply(@PathVariable("id") Long id){
oaCustomFormApplyService.submitApply(id);
return success();
}
}

116
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaCustomFormController.java
View File

@@ -1,116 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.back.oa.domain.OaCustomForm;
import com.ruoyi.back.oa.service.OaCustomFormService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 自定义表单Controller
*
* @author pointLion
* @date 2022-07-05
*/
@RestController
@RequestMapping("/oa/customForm")
public class OaCustomFormController extends BaseController
{
@Autowired
private OaCustomFormService oaCustomFormService;
/**
* 查询自定义表单列表
*/
@PreAuthorize("@ss.hasPermi('oa:customForm:list')")
@GetMapping("/list")
public TableDataInfo list(OaCustomForm oaCustomForm)
{
startPage();
List<OaCustomForm> list = oaCustomFormService.selectOaCustomFormList(oaCustomForm);
return getDataTable(list);
}
/**
* 查询自定义表单列表
*/
@PreAuthorize("@ss.hasPermi('oa:customForm:list')")
@GetMapping("/listAll")
public AjaxResult listAll(OaCustomForm oaCustomForm)
{
List<OaCustomForm> list = oaCustomFormService.selectOaCustomFormList(oaCustomForm);
return success("查询成功",list);
}
/**
* 导出自定义表单列表
*/
@PreAuthorize("@ss.hasPermi('oa:customForm:export')")
@Log(title = "自定义表单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaCustomForm oaCustomForm)
{
List<OaCustomForm> list = oaCustomFormService.selectOaCustomFormList(oaCustomForm);
ExcelUtil<OaCustomForm> util = new ExcelUtil<OaCustomForm>(OaCustomForm.class);
util.exportExcel(response, list, "自定义表单数据");
}
/**
* 获取自定义表单详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:customForm:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaCustomFormService.selectOaCustomFormById(id));
}
/**
* 新增自定义表单
*/
@PreAuthorize("@ss.hasPermi('oa:customForm:add')")
@Log(title = "自定义表单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaCustomForm oaCustomForm)
{
return toAjax(oaCustomFormService.insertOaCustomForm(oaCustomForm));
}
/**
* 修改自定义表单
*/
@PreAuthorize("@ss.hasPermi('oa:customForm:edit')")
@Log(title = "自定义表单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaCustomForm oaCustomForm)
{
return toAjax(oaCustomFormService.updateOaCustomForm(oaCustomForm));
}
/**
* 删除自定义表单
*/
@PreAuthorize("@ss.hasPermi('oa:customForm:remove')")
@Log(title = "自定义表单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaCustomFormService.deleteOaCustomFormByIds(ids));
}
}

131
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaDutyApplyController.java
View File

@@ -1,131 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaDutyApply;
import com.ruoyi.back.oa.service.OaDutyApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 假勤申请Controller
*
* @author pointLion
* @date 2023-06-01
*/
@RestController
@RequestMapping("/oa/dutyApply")
public class OaDutyApplyController extends BaseController
{
@Autowired
private OaDutyApplyService oaDutyApplyService;
/**
* 查询假勤申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:dutyApply:list')")
@GetMapping("/list")
public TableDataInfo list(OaDutyApply oaDutyApply)
{
startPage();
List<OaDutyApply> list = oaDutyApplyService.selectOaDutyApplyList(oaDutyApply);
return getDataTable(list);
}
/**
* 导出假勤申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:dutyApply:export')")
@Log(title = "假勤申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaDutyApply oaDutyApply)
{
List<OaDutyApply> list = oaDutyApplyService.selectOaDutyApplyList(oaDutyApply);
ExcelUtil<OaDutyApply> util = new ExcelUtil<OaDutyApply>(OaDutyApply.class);
util.exportExcel(response, list, "假勤申请数据");
}
/**
* 获取假勤申请详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:dutyApply:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaDutyApplyService.selectOaDutyApplyById(id));
}
/**
* 新增假勤申请
*/
@PreAuthorize("@ss.hasPermi('oa:dutyApply:add')")
@Log(title = "假勤申请", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaDutyApply oaDutyApply)
{
return toAjax(oaDutyApplyService.insertOaDutyApply(oaDutyApply));
}
/**
* 修改假勤申请
*/
@PreAuthorize("@ss.hasPermi('oa:dutyApply:edit')")
@Log(title = "假勤申请", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaDutyApply oaDutyApply)
{
return toAjax(oaDutyApplyService.updateOaDutyApply(oaDutyApply));
}
/**
* 删除假勤申请
*/
@PreAuthorize("@ss.hasPermi('oa:dutyApply:remove')")
@Log(title = "假勤申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaDutyApplyService.deleteOaDutyApplyByIds(ids));
}
/*****
* 提交流程
* @param id
* @return
* @throws Exception
*/
@RequestMapping("/submitFlow/{id}")
public AjaxResult submitFlow(@PathVariable("id")Long id) throws Exception {
oaDutyApplyService.submitFlow(id);
return success();
}
/*****
* 取回流程
* @param id
* @return
* @throws Exception
*/
@RequestMapping("/cancleFlow/{id}")
public AjaxResult cancleFlow(@PathVariable("id")Long id) throws Exception {
oaDutyApplyService.cancleFlow(id);
return success();
}
}

104
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaHotelApplyController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaHotelApply;
import com.ruoyi.back.oa.service.OaHotelApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 酒店申请Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/hotelApply")
public class OaHotelApplyController extends BaseController
{
@Autowired
private OaHotelApplyService oaHotelApplyService;
/**
* 查询酒店申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:hotelApply:list')")
@GetMapping("/list")
public TableDataInfo list(OaHotelApply oaHotelApply)
{
startPage();
List<OaHotelApply> list = oaHotelApplyService.selectOaHotelApplyList(oaHotelApply);
return getDataTable(list);
}
/**
* 导出酒店申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:hotelApply:export')")
@Log(title = "酒店申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaHotelApply oaHotelApply)
{
List<OaHotelApply> list = oaHotelApplyService.selectOaHotelApplyList(oaHotelApply);
ExcelUtil<OaHotelApply> util = new ExcelUtil<OaHotelApply>(OaHotelApply.class);
util.exportExcel(response, list, "酒店申请数据");
}
/**
* 获取酒店申请详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:hotelApply:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaHotelApplyService.selectOaHotelApplyById(id));
}
/**
* 新增酒店申请
*/
@PreAuthorize("@ss.hasPermi('oa:hotelApply:add')")
@Log(title = "酒店申请", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaHotelApply oaHotelApply)
{
return toAjax(oaHotelApplyService.insertOaHotelApply(oaHotelApply));
}
/**
* 修改酒店申请
*/
@PreAuthorize("@ss.hasPermi('oa:hotelApply:edit')")
@Log(title = "酒店申请", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaHotelApply oaHotelApply)
{
return toAjax(oaHotelApplyService.updateOaHotelApply(oaHotelApply));
}
/**
* 删除酒店申请
*/
@PreAuthorize("@ss.hasPermi('oa:hotelApply:remove')")
@Log(title = "酒店申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaHotelApplyService.deleteOaHotelApplyByIds(ids));
}
}

104
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaMeetingroomApplyController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaMeetingroomApply;
import com.ruoyi.back.oa.service.OaMeetingroomApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 会议室申请Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/meetingroomApply")
public class OaMeetingroomApplyController extends BaseController
{
@Autowired
private OaMeetingroomApplyService oaMeetingroomApplyService;
/**
* 查询会议室申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroomApply:list')")
@GetMapping("/list")
public TableDataInfo list(OaMeetingroomApply oaMeetingroomApply)
{
startPage();
List<OaMeetingroomApply> list = oaMeetingroomApplyService.selectOaMeetingroomApplyList(oaMeetingroomApply);
return getDataTable(list);
}
/**
* 导出会议室申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroomApply:export')")
@Log(title = "会议室申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaMeetingroomApply oaMeetingroomApply)
{
List<OaMeetingroomApply> list = oaMeetingroomApplyService.selectOaMeetingroomApplyList(oaMeetingroomApply);
ExcelUtil<OaMeetingroomApply> util = new ExcelUtil<OaMeetingroomApply>(OaMeetingroomApply.class);
util.exportExcel(response, list, "会议室申请数据");
}
/**
* 获取会议室申请详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroomApply:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaMeetingroomApplyService.selectOaMeetingroomApplyById(id));
}
/**
* 新增会议室申请
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroomApply:add')")
@Log(title = "会议室申请", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaMeetingroomApply oaMeetingroomApply)
{
return toAjax(oaMeetingroomApplyService.insertOaMeetingroomApply(oaMeetingroomApply));
}
/**
* 修改会议室申请
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroomApply:edit')")
@Log(title = "会议室申请", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaMeetingroomApply oaMeetingroomApply)
{
return toAjax(oaMeetingroomApplyService.updateOaMeetingroomApply(oaMeetingroomApply));
}
/**
* 删除会议室申请
*/
@PreAuthorize("@ss.hasPermi('oa:meetingroomApply:remove')")
@Log(title = "会议室申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaMeetingroomApplyService.deleteOaMeetingroomApplyByIds(ids));
}
}

132
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaReimburseApplyController.java
View File

@@ -1,132 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaReimburseApply;
import com.ruoyi.back.oa.service.OaReimburseApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 报销申请Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/reimburseApply")
public class OaReimburseApplyController extends BaseController
{
@Autowired
private OaReimburseApplyService oaReimburseApplyService;
/**
* 查询报销申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:reimburseApply:list')")
@GetMapping("/list")
public TableDataInfo list(OaReimburseApply oaReimburseApply)
{
startPage();
List<OaReimburseApply> list = oaReimburseApplyService.selectOaReimburseApplyList(oaReimburseApply);
return getDataTable(list);
}
/**
* 导出报销申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:reimburseApply:export')")
@Log(title = "报销申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaReimburseApply oaReimburseApply)
{
List<OaReimburseApply> list = oaReimburseApplyService.selectOaReimburseApplyList(oaReimburseApply);
ExcelUtil<OaReimburseApply> util = new ExcelUtil<OaReimburseApply>(OaReimburseApply.class);
util.exportExcel(response, list, "报销申请数据");
}
/**
* 获取报销申请详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:reimburseApply:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaReimburseApplyService.selectOaReimburseApplyById(id));
}
/**
* 新增报销申请
*/
@PreAuthorize("@ss.hasPermi('oa:reimburseApply:add')")
@Log(title = "报销申请", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaReimburseApply oaReimburseApply)
{
return toAjax(oaReimburseApplyService.insertOaReimburseApply(oaReimburseApply));
}
/**
* 修改报销申请
*/
@PreAuthorize("@ss.hasPermi('oa:reimburseApply:edit')")
@Log(title = "报销申请", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaReimburseApply oaReimburseApply)
{
return toAjax(oaReimburseApplyService.updateOaReimburseApply(oaReimburseApply));
}
/**
* 删除报销申请
*/
@PreAuthorize("@ss.hasPermi('oa:reimburseApply:remove')")
@Log(title = "报销申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaReimburseApplyService.deleteOaReimburseApplyByIds(ids));
}
/*****
* 提交流程
* @param id
* @return
* @throws Exception
*/
@RequestMapping("/submitFlow/{id}")
public AjaxResult submitFlow(@PathVariable("id")Long id) throws Exception {
oaReimburseApplyService.submitFlow(id);
return success();
}
/*****
* 取回流程
* @param id
* @return
* @throws Exception
*/
@RequestMapping("/cancleFlow/{id}")
public AjaxResult cancleFlow(@PathVariable("id")Long id) throws Exception {
oaReimburseApplyService.cancleFlow(id);
return success();
}
}

104
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaSealApplyController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaSealApply;
import com.ruoyi.back.oa.service.OaSealApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 公章使用Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/sealApply")
public class OaSealApplyController extends BaseController
{
@Autowired
private OaSealApplyService oaSealApplyService;
/**
* 查询公章使用列表
*/
@PreAuthorize("@ss.hasPermi('oa:sealApply:list')")
@GetMapping("/list")
public TableDataInfo list(OaSealApply oaSealApply)
{
startPage();
List<OaSealApply> list = oaSealApplyService.selectOaSealApplyList(oaSealApply);
return getDataTable(list);
}
/**
* 导出公章使用列表
*/
@PreAuthorize("@ss.hasPermi('oa:sealApply:export')")
@Log(title = "公章使用", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaSealApply oaSealApply)
{
List<OaSealApply> list = oaSealApplyService.selectOaSealApplyList(oaSealApply);
ExcelUtil<OaSealApply> util = new ExcelUtil<OaSealApply>(OaSealApply.class);
util.exportExcel(response, list, "公章使用数据");
}
/**
* 获取公章使用详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:sealApply:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaSealApplyService.selectOaSealApplyById(id));
}
/**
* 新增公章使用
*/
@PreAuthorize("@ss.hasPermi('oa:sealApply:add')")
@Log(title = "公章使用", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaSealApply oaSealApply)
{
return toAjax(oaSealApplyService.insertOaSealApply(oaSealApply));
}
/**
* 修改公章使用
*/
@PreAuthorize("@ss.hasPermi('oa:sealApply:edit')")
@Log(title = "公章使用", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaSealApply oaSealApply)
{
return toAjax(oaSealApplyService.updateOaSealApply(oaSealApply));
}
/**
* 删除公章使用
*/
@PreAuthorize("@ss.hasPermi('oa:sealApply:remove')")
@Log(title = "公章使用", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaSealApplyService.deleteOaSealApplyByIds(ids));
}
}

104
PointLion/src/main/java/com/ruoyi/back/oa/controller/OaTicketApplyController.java
View File

@@ -1,104 +0,0 @@
package com.ruoyi.back.oa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.back.oa.domain.OaTicketApply;
import com.ruoyi.back.oa.service.OaTicketApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 车票申请Controller
*
* @author pointLion
* @date 2023-05-29
*/
@RestController
@RequestMapping("/oa/ticketApply")
public class OaTicketApplyController extends BaseController
{
@Autowired
private OaTicketApplyService oaTicketApplyService;
/**
* 查询车票申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:ticketApply:list')")
@GetMapping("/list")
public TableDataInfo list(OaTicketApply oaTicketApply)
{
startPage();
List<OaTicketApply> list = oaTicketApplyService.selectOaTicketApplyList(oaTicketApply);
return getDataTable(list);
}
/**
* 导出车票申请列表
*/
@PreAuthorize("@ss.hasPermi('oa:ticketApply:export')")
@Log(title = "车票申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OaTicketApply oaTicketApply)
{
List<OaTicketApply> list = oaTicketApplyService.selectOaTicketApplyList(oaTicketApply);
ExcelUtil<OaTicketApply> util = new ExcelUtil<OaTicketApply>(OaTicketApply.class);
util.exportExcel(response, list, "车票申请数据");
}
/**
* 获取车票申请详细信息
*/
@PreAuthorize("@ss.hasPermi('oa:ticketApply:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(oaTicketApplyService.selectOaTicketApplyById(id));
}
/**
* 新增车票申请
*/
@PreAuthorize("@ss.hasPermi('oa:ticketApply:add')")
@Log(title = "车票申请", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OaTicketApply oaTicketApply)
{
return toAjax(oaTicketApplyService.insertOaTicketApply(oaTicketApply));
}
/**
* 修改车票申请
*/
@PreAuthorize("@ss.hasPermi('oa:ticketApply:edit')")
@Log(title = "车票申请", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OaTicketApply oaTicketApply)
{
return toAjax(oaTicketApplyService.updateOaTicketApply(oaTicketApply));
}
/**
* 删除车票申请
*/
@PreAuthorize("@ss.hasPermi('oa:ticketApply:remove')")
@Log(title = "车票申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(oaTicketApplyService.deleteOaTicketApplyByIds(ids));
}
}

60
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomForm.java
View File

@@ -1,60 +0,0 @@
package com.ruoyi.back.oa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 自定义表单对象 oa_custom_form
*
* @author pointLion
* @date 2022-07-07
*/
@Data
public class OaCustomForm extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 表单名称 */
@Excel(name = "表单名称")
private String name;
/** 表单分类 */
@Excel(name = "表单分类")
private String category;
/** 表单规则 */
@Excel(name = "表单规则")
private String rules;
/** 表单配置 */
@Excel(name = "表单配置")
private String options;
/** 表单代码 */
@Excel(name = "表单代码")
private String formKey;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("category", getCategory())
.append("rules", getRules())
.append("options", getOptions())
.append("formKey", getFormKey())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

99
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaCustomFormApply.java
View File

@@ -1,99 +0,0 @@
package com.ruoyi.back.oa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 自定义表单申请对象 oa_custom_form_apply
*
* @author pointLion
* @date 2022-07-09
*/
@Data
public class OaCustomFormApply extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
@Excel(name = "主键")
private Long id;
/** 表单名称 */
@Excel(name = "表单名称")
private String name;
/** 表单分类 */
@Excel(name = "表单分类")
private String category;
/** 表单规则 */
@Excel(name = "表单规则")
private String rules;
/** 表单配置 */
@Excel(name = "表单配置")
private String options;
/** 表单数据 */
@Excel(name = "表单数据")
private String formData;
/** 表单代码 */
@Excel(name = "表单代码")
private String formKey;
/** 申请流程 */
@Excel(name = "申请流程")
private String flowKey;
/** 流程名称 */
@Excel(name = "流程名称")
private String flowName;
/** 流程实例id */
@Excel(name = "流程实例id")
private String flowInsId;
/** 申请标题 */
@Excel(name = "申请标题")
private String applyTitle;
/** 状态 */
@Excel(name = "状态", readConverterExp = "0=未提交,1=已提交,2=已完成")
private String status;
/** 提交时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date submitTime;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("category", getCategory())
.append("rules", getRules())
.append("options", getOptions())
.append("formData", getFormData())
.append("formKey", getFormKey())
.append("flowKey", getFlowKey())
.append("flowName", getFlowName())
.append("flowInsId", getFlowInsId())
.append("applyTitle", getApplyTitle())
.append("submitTime", getSubmitTime())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("status", getStatus())
.toString();
}
}

112
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaDutyApply.java
View File

@@ -1,112 +0,0 @@
package com.ruoyi.back.oa.domain;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 假勤申请对象 oa_duty_apply
*
* @author pointLion
* @date 2023-06-01
*/
@Data
public class OaDutyApply extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 单据类型 */
@Excel(name = "单据类型")
private String billType;
/** 申请类型 */
@Excel(name = "申请类型")
private String leaveType;
/** 单据编号 */
@Excel(name = "单据编号")
private String billCode;
/** 申请流程 */
@Excel(name = "申请流程")
private String flowKey;
/** 流程实例id */
@Excel(name = "流程实例id")
private String flowInsId;
/** 申请标题 */
@Excel(name = "申请标题")
private String applyTitle;
/** 提交时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date submitTime;
/** 流程状态。0：未提交。1：审批中。2：已完成 */
@Excel(name = "流程状态。0：未提交。1：审批中。2：已完成")
private String status;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
/** 天数 */
@Excel(name = "天数")
private BigDecimal days;
/** 事由 */
@Excel(name = "事由")
private String reason;
/** 用户ID（单据 拥有者） */
@Excel(name = "用户ID", readConverterExp = "单=据,拥=有者")
private Long userId;
/** 部门ID（单据拥有部门） */
@Excel(name = "部门ID", readConverterExp = "单=据拥有部门")
private Long deptId;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("billType", getBillType())
.append("leaveType", getLeaveType())
.append("billCode", getBillCode())
.append("flowKey", getFlowKey())
.append("flowInsId", getFlowInsId())
.append("applyTitle", getApplyTitle())
.append("submitTime", getSubmitTime())
.append("status", getStatus())
.append("remark", getRemark())
.append("startTime", getStartTime())
.append("endTime", getEndTime())
.append("days", getDays())
.append("reason", getReason())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

124
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaHotelApply.java
View File

@@ -1,124 +0,0 @@
package com.ruoyi.back.oa.domain;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 酒店申请对象 oa_hotel_apply
*
* @author pointLion
* @date 2023-05-29
*/
@Data
public class OaHotelApply extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 用户ID（单据 拥有者） */
private Long userId;
/** 部门ID（单据拥有部门） */
private Long deptId;
/** 流程状态 */
@Excel(name = "流程状态")
private String status;
/** 申请流程 */
private String flowKey;
/** 流程实例id */
private String flowInsId;
/** 申请标题 */
private String applyTitle;
/** 提交时间 */
private Date submitTime;
/** 单据编号 */
@Excel(name = "单据编号")
private String billcode;
/** 使用城市 */
@Excel(name = "使用城市")
private String applyCity;
/** 所在街道 */
@Excel(name = "所在街道")
private String street;
/** 酒店名称 */
@Excel(name = "酒店名称")
private String hotelName;
/** 预计金额 */
@Excel(name = "预计金额")
private BigDecimal totalAmt;
/** 房间类型 */
@Excel(name = "房间类型")
private String roomType;
/** 房间数量 */
@Excel(name = "房间数量")
private Long roomCount;
/** 房间等级 */
@Excel(name = "房间等级")
private String roomLevel;
/** 入住人数 */
@Excel(name = "入住人数")
private Long userCount;
/** 入住时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "入住时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date useTime;
/** 事项描述 */
@Excel(name = "事项描述")
private String reasonDes;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("status", getStatus())
.append("flowKey", getFlowKey())
.append("flowInsId", getFlowInsId())
.append("applyTitle", getApplyTitle())
.append("submitTime", getSubmitTime())
.append("billcode", getBillcode())
.append("remark", getRemark())
.append("applyCity", getApplyCity())
.append("street", getStreet())
.append("hotelName", getHotelName())
.append("totalAmt", getTotalAmt())
.append("roomType", getRoomType())
.append("roomCount", getRoomCount())
.append("roomLevel", getRoomLevel())
.append("userCount", getUserCount())
.append("useTime", getUseTime())
.append("reasonDes", getReasonDes())
.toString();
}
}

107
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaMeetingroomApply.java
View File

@@ -1,107 +0,0 @@
package com.ruoyi.back.oa.domain;
import lombok.Data;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 会议室申请对象 oa_meetingroom_apply
*
* @author pointLion
* @date 2023-05-29
*/
@Data
public class OaMeetingroomApply extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 用户ID（单据 拥有者） */
@Excel(name = "用户ID", readConverterExp = "单=据,拥=有者")
private Long userId;
/** 部门ID（单据拥有部门） */
@Excel(name = "部门ID", readConverterExp = "单=据拥有部门")
private Long deptId;
/** 流程状态 */
@Excel(name = "流程状态")
private String status;
/** 申请流程 */
private String flowKey;
/** 流程实例id */
private String flowInsId;
/** 申请标题 */
private String applyTitle;
/** 提交时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date submitTime;
/** 单据编号 */
@Excel(name = "单据编号")
private String billcode;
/** 使用时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
/** 房间号 */
@Excel(name = "房间号")
private String roomNum;
/** 使用人数 */
@Excel(name = "使用人数")
private Long userCount;
/** 会议题目 */
@Excel(name = "会议题目")
private String meetingTitle;
/** 会议纪要 */
private String meetingDes;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("status", getStatus())
.append("flowKey", getFlowKey())
.append("flowInsId", getFlowInsId())
.append("applyTitle", getApplyTitle())
.append("submitTime", getSubmitTime())
.append("billcode", getBillcode())
.append("remark", getRemark())
.append("startTime", getStartTime())
.append("endTime", getEndTime())
.append("roomNum", getRoomNum())
.append("userCount", getUserCount())
.append("meetingTitle", getMeetingTitle())
.append("meetingDes", getMeetingDes())
.toString();
}
}

152
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseApply.java
View File

@@ -1,152 +0,0 @@
package com.ruoyi.back.oa.domain;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 报销申请对象 oa_reimburse_apply
*
* @author pointLion
* @date 2023-05-29
*/
@Data
public class OaReimburseApply extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 用户ID（单据 拥有者） */
@Excel(name = "用户ID", readConverterExp = "单=据,拥=有者")
private Long userId;
/** 部门ID（单据拥有部门） */
@Excel(name = "部门ID", readConverterExp = "单=据拥有部门")
private Long deptId;
/** 流程状态 */
@Excel(name = "流程状态")
private String status;
/** 申请流程 */
@Excel(name = "申请流程")
private String flowKey;
/** 流程实例id */
private String flowInsId;
/** 申请标题 */
@Excel(name = "申请标题")
private String applyTitle;
/** 提交时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date submitTime;
/** 单据编号 */
@Excel(name = "单据编号")
private String billcode;
/** 总金额 */
@Excel(name = "总金额")
private BigDecimal totalAmt;
/** 单据类型 */
@Excel(name = "单据类型")
private String billType;
/** 月度 */
@Excel(name = "月度")
private String month;
/** 描述信息 */
@Excel(name = "描述信息")
private String des;
/** 出差地点 */
@Excel(name = "出差地点")
private String city;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
/** 票据总数 */
@Excel(name = "票据总数")
private Long billCount;
/****
* 票据快照
*/
private String imgUrl;
/*****
* 补贴标准
*/
private BigDecimal standardSubsidy;
/****
* 出差天数
*/
private Long days;
/****
* 补贴总金额
*/
private BigDecimal subsidyAmt;
/****
* 票据总金额
*/
private BigDecimal billAmt;
/** 报销费用明细信息 */
private List<OaReimburseFeeitem> oaReimburseFeeitemList;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("status", getStatus())
.append("flowKey", getFlowKey())
.append("flowInsId", getFlowInsId())
.append("applyTitle", getApplyTitle())
.append("submitTime", getSubmitTime())
.append("billcode", getBillcode())
.append("remark", getRemark())
.append("totalAmt", getTotalAmt())
.append("billType", getBillType())
.append("month", getMonth())
.append("des", getDes())
.append("city", getCity())
.append("startTime", getStartTime())
.append("endTime", getEndTime())
.append("billCount", getBillCount())
.toString();
}
}

228
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaReimburseFeeitem.java
View File

@@ -1,228 +0,0 @@
package com.ruoyi.back.oa.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 报销费用明细对象 oa_reimburse_feeitem
*
* @author pointLion
* @date 2023-05-29
*/
public class OaReimburseFeeitem extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 报销单id */
@Excel(name = "报销单id")
private Long reimburseId;
/** 款项金额 */
@Excel(name = "款项金额")
private BigDecimal itemAmt;
/** 年份 */
@Excel(name = "年份")
private String year;
/** 月份 */
@Excel(name = "月份")
private String month;
/** 票据类型 */
@Excel(name = "票据类型")
private String billType;
/** 票据张数 */
@Excel(name = "票据张数")
private Long billCount;
/** 起始地 */
@Excel(name = "起始地")
private String startCity;
/** 目的地 */
@Excel(name = "目的地")
private String endCity;
/** 票据日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "票据日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date billDate;
/** 天数 */
@Excel(name = "天数")
private BigDecimal dayCount;
/** 补贴标准 */
@Excel(name = "补贴标准")
private BigDecimal standardSubsidy;
/** 费用类型 */
@Excel(name = "费用类型")
private String itemType;
/** 住宿地点 */
@Excel(name = "住宿地点")
private String stayCity;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setReimburseId(Long reimburseId)
{
this.reimburseId = reimburseId;
}
public Long getReimburseId()
{
return reimburseId;
}
public void setItemAmt(BigDecimal itemAmt)
{
this.itemAmt = itemAmt;
}
public BigDecimal getItemAmt()
{
return itemAmt;
}
public void setYear(String year)
{
this.year = year;
}
public String getYear()
{
return year;
}
public void setMonth(String month)
{
this.month = month;
}
public String getMonth()
{
return month;
}
public void setBillType(String billType)
{
this.billType = billType;
}
public String getBillType()
{
return billType;
}
public void setBillCount(Long billCount)
{
this.billCount = billCount;
}
public Long getBillCount()
{
return billCount;
}
public void setStartCity(String startCity)
{
this.startCity = startCity;
}
public String getStartCity()
{
return startCity;
}
public void setEndCity(String endCity)
{
this.endCity = endCity;
}
public String getEndCity()
{
return endCity;
}
public void setBillDate(Date billDate)
{
this.billDate = billDate;
}
public Date getBillDate()
{
return billDate;
}
public void setDayCount(BigDecimal dayCount)
{
this.dayCount = dayCount;
}
public BigDecimal getDayCount()
{
return dayCount;
}
public void setStandardSubsidy(BigDecimal standardSubsidy)
{
this.standardSubsidy = standardSubsidy;
}
public BigDecimal getStandardSubsidy()
{
return standardSubsidy;
}
public void setItemType(String itemType)
{
this.itemType = itemType;
}
public String getItemType()
{
return itemType;
}
public void setStayCity(String stayCity)
{
this.stayCity = stayCity;
}
public String getStayCity()
{
return stayCity;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("reimburseId", getReimburseId())
.append("itemAmt", getItemAmt())
.append("year", getYear())
.append("month", getMonth())
.append("billType", getBillType())
.append("billCount", getBillCount())
.append("startCity", getStartCity())
.append("endCity", getEndCity())
.append("billDate", getBillDate())
.append("dayCount", getDayCount())
.append("standardSubsidy", getStandardSubsidy())
.append("itemType", getItemType())
.append("stayCity", getStayCity())
.toString();
}
}

96
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaSealApply.java
View File

@@ -1,96 +0,0 @@
package com.ruoyi.back.oa.domain;
import lombok.Data;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 公章使用对象 oa_seal_apply
*
* @author pointLion
* @date 2023-05-29
*/
@Data
public class OaSealApply extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 用户ID（单据 拥有者） */
private Long userId;
/** 部门ID（单据拥有部门） */
private Long deptId;
/** 流程状态 */
@Excel(name = "流程状态")
private String status;
/** 申请流程 */
private String flowKey;
/** 流程实例id */
private String flowInsId;
/** 申请标题 */
private String applyTitle;
/** 提交时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date submitTime;
/** 单据编号 */
@Excel(name = "单据编号")
private String billcode;
/** 公章 */
@Excel(name = "公章")
private String sealType;
/** 使用时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date useTime;
/** 归还时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date backTime;
/** 使用描述 */
@Excel(name = "使用描述")
private String useInfo;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("status", getStatus())
.append("flowKey", getFlowKey())
.append("flowInsId", getFlowInsId())
.append("applyTitle", getApplyTitle())
.append("submitTime", getSubmitTime())
.append("billcode", getBillcode())
.append("remark", getRemark())
.append("sealType", getSealType())
.append("useTime", getUseTime())
.append("backTime", getBackTime())
.append("useInfo", getUseInfo())
.toString();
}
}

111
PointLion/src/main/java/com/ruoyi/back/oa/domain/OaTicketApply.java
View File

@@ -1,111 +0,0 @@
package com.ruoyi.back.oa.domain;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 车票申请对象 oa_ticket_apply
*
* @author pointLion
* @date 2023-05-29
*/
@Data
public class OaTicketApply extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 用户ID */
private Long userId;
/** 部门ID */
private Long deptId;
/** 流程状态 */
@Excel(name = "流程状态")
private String status;
/** 申请流程 */
private String flowKey;
/** 流程实例id */
private String flowInsId;
/** 申请标题 */
private String applyTitle;
/** 提交时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date submitTime;
/** 单据编号 */
@Excel(name = "单据编号")
private String billcode;
/** 目的地 */
@Excel(name = "目的地")
private String destination;
/** 出发地 */
@Excel(name = "出发地")
private String departure;
/** 预计金额 */
@Excel(name = "预计金额")
private BigDecimal totalAmt;
/** 启程时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "启程时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date goTime;
/** 车次/架次 */
@Excel(name = "车次/架次")
private Long carNum;
/** 真实姓名 */
@Excel(name = "真实姓名")
private String applyRealname;
/** 身份证号 */
@Excel(name = "身份证号")
private String idNum;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userId", getUserId())
.append("deptId", getDeptId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("status", getStatus())
.append("flowKey", getFlowKey())
.append("flowInsId", getFlowInsId())
.append("applyTitle", getApplyTitle())
.append("submitTime", getSubmitTime())
.append("billcode", getBillcode())
.append("remark", getRemark())
.append("destination", getDestination())
.append("departure", getDeparture())
.append("totalAmt", getTotalAmt())
.append("goTime", getGoTime())
.append("carNum", getCarNum())
.append("applyRealname", getApplyRealname())
.append("idNum", getIdNum())
.toString();
}
}

72
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormApplyMapper.java
View File

@@ -1,72 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaCustomFormApply;
import org.apache.ibatis.annotations.Param;
/**
* 自定义表单申请Mapper接口
*
* @author pointLion
* @date 2022-07-09
*/
public interface OaCustomFormApplyMapper
{
/**
* 查询自定义表单申请
*
* @param id 自定义表单申请主键
* @return 自定义表单申请
*/
public OaCustomFormApply selectOaCustomFormApplyById(Long id);
/**
* 查询自定义表单申请
*
* @param id 自定义表单申请主键
* @return 自定义表单申请
*/
public OaCustomFormApply selectOaCustomFormApplyByInsId(@Param("insId") String insId);
/**
* 查询自定义表单申请列表
*
* @param oaCustomFormApply 自定义表单申请
* @return 自定义表单申请集合
*/
public List<OaCustomFormApply> selectOaCustomFormApplyList(OaCustomFormApply oaCustomFormApply);
/**
* 新增自定义表单申请
*
* @param oaCustomFormApply 自定义表单申请
* @return 结果
*/
public int insertOaCustomFormApply(OaCustomFormApply oaCustomFormApply);
/**
* 修改自定义表单申请
*
* @param oaCustomFormApply 自定义表单申请
* @return 结果
*/
public int updateOaCustomFormApply(OaCustomFormApply oaCustomFormApply);
/**
* 删除自定义表单申请
*
* @param id 自定义表单申请主键
* @return 结果
*/
public int deleteOaCustomFormApplyById(Long id);
/**
* 批量删除自定义表单申请
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaCustomFormApplyByIds(Long[] ids);
}

61
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaCustomFormMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaCustomForm;
/**
* 自定义单Mapper接口
*
* @author pointLion
* @date 2022-07-05
*/
public interface OaCustomFormMapper
{
/**
* 查询自定义单
*
* @param id 自定义单主键
* @return 自定义单
*/
public OaCustomForm selectOaCustomFormById(Long id);
/**
* 查询自定义单列表
*
* @param oaCustomForm 自定义单
* @return 自定义单集合
*/
public List<OaCustomForm> selectOaCustomFormList(OaCustomForm oaCustomForm);
/**
* 新增自定义单
*
* @param oaCustomForm 自定义单
* @return 结果
*/
public int insertOaCustomForm(OaCustomForm oaCustomForm);
/**
* 修改自定义单
*
* @param oaCustomForm 自定义单
* @return 结果
*/
public int updateOaCustomForm(OaCustomForm oaCustomForm);
/**
* 删除自定义单
*
* @param id 自定义单主键
* @return 结果
*/
public int deleteOaCustomFormById(Long id);
/**
* 批量删除自定义单
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaCustomFormByIds(Long[] ids);
}

61
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaDutyApplyMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaDutyApply;
/**
* 假勤申请Mapper接口
*
* @author pointLion
* @date 2023-06-01
*/
public interface OaDutyApplyMapper
{
/**
* 查询假勤申请
*
* @param id 假勤申请主键
* @return 假勤申请
*/
public OaDutyApply selectOaDutyApplyById(Long id);
/**
* 查询假勤申请列表
*
* @param oaDutyApply 假勤申请
* @return 假勤申请集合
*/
public List<OaDutyApply> selectOaDutyApplyList(OaDutyApply oaDutyApply);
/**
* 新增假勤申请
*
* @param oaDutyApply 假勤申请
* @return 结果
*/
public int insertOaDutyApply(OaDutyApply oaDutyApply);
/**
* 修改假勤申请
*
* @param oaDutyApply 假勤申请
* @return 结果
*/
public int updateOaDutyApply(OaDutyApply oaDutyApply);
/**
* 删除假勤申请
*
* @param id 假勤申请主键
* @return 结果
*/
public int deleteOaDutyApplyById(Long id);
/**
* 批量删除假勤申请
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaDutyApplyByIds(Long[] ids);
}

61
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaHotelApplyMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaHotelApply;
/**
* 酒店申请Mapper接口
*
* @author pointLion
* @date 2023-05-29
*/
public interface OaHotelApplyMapper
{
/**
* 查询酒店申请
*
* @param id 酒店申请主键
* @return 酒店申请
*/
public OaHotelApply selectOaHotelApplyById(Long id);
/**
* 查询酒店申请列表
*
* @param oaHotelApply 酒店申请
* @return 酒店申请集合
*/
public List<OaHotelApply> selectOaHotelApplyList(OaHotelApply oaHotelApply);
/**
* 新增酒店申请
*
* @param oaHotelApply 酒店申请
* @return 结果
*/
public int insertOaHotelApply(OaHotelApply oaHotelApply);
/**
* 修改酒店申请
*
* @param oaHotelApply 酒店申请
* @return 结果
*/
public int updateOaHotelApply(OaHotelApply oaHotelApply);
/**
* 删除酒店申请
*
* @param id 酒店申请主键
* @return 结果
*/
public int deleteOaHotelApplyById(Long id);
/**
* 批量删除酒店申请
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaHotelApplyByIds(Long[] ids);
}

61
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaMeetingroomApplyMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaMeetingroomApply;
/**
* 会议室申请Mapper接口
*
* @author pointLion
* @date 2023-05-29
*/
public interface OaMeetingroomApplyMapper
{
/**
* 查询会议室申请
*
* @param id 会议室申请主键
* @return 会议室申请
*/
public OaMeetingroomApply selectOaMeetingroomApplyById(Long id);
/**
* 查询会议室申请列表
*
* @param oaMeetingroomApply 会议室申请
* @return 会议室申请集合
*/
public List<OaMeetingroomApply> selectOaMeetingroomApplyList(OaMeetingroomApply oaMeetingroomApply);
/**
* 新增会议室申请
*
* @param oaMeetingroomApply 会议室申请
* @return 结果
*/
public int insertOaMeetingroomApply(OaMeetingroomApply oaMeetingroomApply);
/**
* 修改会议室申请
*
* @param oaMeetingroomApply 会议室申请
* @return 结果
*/
public int updateOaMeetingroomApply(OaMeetingroomApply oaMeetingroomApply);
/**
* 删除会议室申请
*
* @param id 会议室申请主键
* @return 结果
*/
public int deleteOaMeetingroomApplyById(Long id);
/**
* 批量删除会议室申请
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaMeetingroomApplyByIds(Long[] ids);
}

87
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaReimburseApplyMapper.java
View File

@@ -1,87 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaReimburseApply;
import com.ruoyi.back.oa.domain.OaReimburseFeeitem;
/**
* 报销申请Mapper接口
*
* @author pointLion
* @date 2023-05-29
*/
public interface OaReimburseApplyMapper
{
/**
* 查询报销申请
*
* @param id 报销申请主键
* @return 报销申请
*/
public OaReimburseApply selectOaReimburseApplyById(Long id);
/**
* 查询报销申请列表
*
* @param oaReimburseApply 报销申请
* @return 报销申请集合
*/
public List<OaReimburseApply> selectOaReimburseApplyList(OaReimburseApply oaReimburseApply);
/**
* 新增报销申请
*
* @param oaReimburseApply 报销申请
* @return 结果
*/
public int insertOaReimburseApply(OaReimburseApply oaReimburseApply);
/**
* 修改报销申请
*
* @param oaReimburseApply 报销申请
* @return 结果
*/
public int updateOaReimburseApply(OaReimburseApply oaReimburseApply);
/**
* 删除报销申请
*
* @param id 报销申请主键
* @return 结果
*/
public int deleteOaReimburseApplyById(Long id);
/**
* 批量删除报销申请
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaReimburseApplyByIds(Long[] ids);
/**
* 批量删除报销费用明细
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteoaReimburseFeeitemByReimburseIds(Long[] ids);
/**
* 批量新增报销费用明细
*
* @param oaReimburseFeeitemList 报销费用明细列表
* @return 结果
*/
public int batchoaReimburseFeeitem(List<OaReimburseFeeitem> oaReimburseFeeitemList);
/**
* 通过报销申请主键删除报销费用明细信息
*
* @param id 报销申请ID
* @return 结果
*/
public int deleteoaReimburseFeeitemByReimburseId(Long id);
}

61
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaSealApplyMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaSealApply;
/**
* 公章使用Mapper接口
*
* @author pointLion
* @date 2023-05-29
*/
public interface OaSealApplyMapper
{
/**
* 查询公章使用
*
* @param id 公章使用主键
* @return 公章使用
*/
public OaSealApply selectOaSealApplyById(Long id);
/**
* 查询公章使用列表
*
* @param oaSealApply 公章使用
* @return 公章使用集合
*/
public List<OaSealApply> selectOaSealApplyList(OaSealApply oaSealApply);
/**
* 新增公章使用
*
* @param oaSealApply 公章使用
* @return 结果
*/
public int insertOaSealApply(OaSealApply oaSealApply);
/**
* 修改公章使用
*
* @param oaSealApply 公章使用
* @return 结果
*/
public int updateOaSealApply(OaSealApply oaSealApply);
/**
* 删除公章使用
*
* @param id 公章使用主键
* @return 结果
*/
public int deleteOaSealApplyById(Long id);
/**
* 批量删除公章使用
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaSealApplyByIds(Long[] ids);
}

61
PointLion/src/main/java/com/ruoyi/back/oa/mapper/OaTicketApplyMapper.java
View File

@@ -1,61 +0,0 @@
package com.ruoyi.back.oa.mapper;
import java.util.List;
import com.ruoyi.back.oa.domain.OaTicketApply;
/**
* 车票申请Mapper接口
*
* @author pointLion
* @date 2023-05-29
*/
public interface OaTicketApplyMapper
{
/**
* 查询车票申请
*
* @param id 车票申请主键
* @return 车票申请
*/
public OaTicketApply selectOaTicketApplyById(Long id);
/**
* 查询车票申请列表
*
* @param oaTicketApply 车票申请
* @return 车票申请集合
*/
public List<OaTicketApply> selectOaTicketApplyList(OaTicketApply oaTicketApply);
/**
* 新增车票申请
*
* @param oaTicketApply 车票申请
* @return 结果
*/
public int insertOaTicketApply(OaTicketApply oaTicketApply);
/**
* 修改车票申请
*
* @param oaTicketApply 车票申请
* @return 结果
*/
public int updateOaTicketApply(OaTicketApply oaTicketApply);
/**
* 删除车票申请
*
* @param id 车票申请主键
* @return 结果
*/
public int deleteOaTicketApplyById(Long id);
/**
* 批量删除车票申请
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOaTicketApplyByIds(Long[] ids);
}

207
PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormApplyService.java
View File

@@ -1,207 +0,0 @@
package com.ruoyi.back.oa.service;
import java.util.Date;
import java.util.List;
import java.util.Map;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.back.erp.service.BaseService;
import com.ruoyi.common.constant.BillTypeEnum;
import com.ruoyi.common.constant.CommonConstants;
import com.ruoyi.back.oa.domain.OaCustomFormApply;
import com.ruoyi.back.oa.mapper.OaCustomFormApplyMapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.util.FlowUtil;
import com.ruoyi.system.mapper.SysUserMapper;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* 自定义表单申请Service业务层处理
*
* @author pointLion
* @date 2022-07-09
*/
@Service
public class OaCustomFormApplyService extends BaseService
{
@Autowired
private OaCustomFormApplyMapper oaCustomFormApplyMapper;
@Autowired
private OaCustomFormApplyService oaCustomFormApplyService;
@Autowired
private RuntimeService runtimeService;
@Autowired
private HistoryService historyService;
@Autowired
private FlowProcessInstanceService flowProcessInstanceService;
@Autowired
private SysUserMapper sysUserMapper;
/**
* 查询自定义表单申请
*
* @param id 自定义表单申请主键
* @return 自定义表单申请
*/
public OaCustomFormApply selectOaCustomFormApplyById(Long id)
{
return oaCustomFormApplyMapper.selectOaCustomFormApplyById(id);
}
/**
* 查询自定义表单申请列表
*
* @param oaCustomFormApply 自定义表单申请
* @return 自定义表单申请
*/
public List<OaCustomFormApply> selectOaCustomFormApplyList(OaCustomFormApply oaCustomFormApply)
{
return oaCustomFormApplyMapper.selectOaCustomFormApplyList(oaCustomFormApply);
}
/**
* 新增自定义表单申请
*
* @param oaCustomFormApply 自定义表单申请
* @return 结果
*/
@Transactional
public Long insertOaCustomFormApply(OaCustomFormApply oaCustomFormApply, LoginUser loginUser)
{
oaCustomFormApply.setCreateBy(loginUser.getUsername());
oaCustomFormApply.setApplyTitle("用户【"+loginUser.getUser().getNickName()+"】申请的【"+oaCustomFormApply.getName()+"单】");
oaCustomFormApply.setCreateTime(DateUtils.getNowDate());
String status = oaCustomFormApply.getStatus();//前台传过来的参数
oaCustomFormApply.setStatus("0");//为了避开校验，提交成功后，后面再进行更新
int i = oaCustomFormApplyMapper.insertOaCustomFormApply(oaCustomFormApply);
String insId = "";
if("1".equals(status)){
SysUser user = sysUserMapper.selectUserByUserName(oaCustomFormApply.getCreateBy());
Map<String,Object> vars = FlowUtil.buildFlowVars(oaCustomFormApply.getApplyTitle(),oaCustomFormApply.getCreateBy(),user.getNickName(),
DateUtil.formatDateTime(oaCustomFormApply.getCreateTime()), CommonConstants.YES);
String businessKey = BillTypeEnum.CUSTOM_FORM.getBillType()+":"+BillTypeEnum.CUSTOM_FORM.getTableName()+":"+oaCustomFormApply.getId();
insId = oaCustomFormApplyService.submitApply(oaCustomFormApply.getFlowKey(),businessKey ,vars);
oaCustomFormApply.setFlowInsId(insId);
OaCustomFormApply updateApply = new OaCustomFormApply();
updateApply.setId(oaCustomFormApply.getId());
updateApply.setFlowInsId(insId);
updateApply.setStatus("1");//更新状态
oaCustomFormApplyMapper.updateOaCustomFormApply(updateApply);
}
return oaCustomFormApply.getId();
}
/**
* 修改自定义表单申请
*
* @param oaCustomFormApply 自定义表单申请
* @return 结果
*/
@Transactional
public int updateOaCustomFormApply(OaCustomFormApply oaCustomFormApply, LoginUser loginUser)
{
oaCustomFormApply.setUpdateBy(loginUser.getUsername());
oaCustomFormApply.setApplyTitle("用户【"+loginUser.getUser().getNickName()+"】申请的【"+oaCustomFormApply.getName()+"单】");
oaCustomFormApply.setUpdateTime(DateUtils.getNowDate());
String insId = "";
if("1".equals(oaCustomFormApply.getStatus())){
String businessKey = BillTypeEnum.CUSTOM_FORM.getBillType()+":"+BillTypeEnum.CUSTOM_FORM.getTableName()+":"+oaCustomFormApply.getId();
Map<String,Object> vars = FlowUtil.buildFlowVars(oaCustomFormApply.getApplyTitle(),oaCustomFormApply.getCreateBy(),
loginUser.getUser().getNickName(), DateUtil.formatDateTime(oaCustomFormApply.getCreateTime()), CommonConstants.YES);
insId = oaCustomFormApplyService.submitApply(oaCustomFormApply.getFlowKey(),businessKey,vars);
oaCustomFormApply.setFlowInsId(insId);
}
int i = oaCustomFormApplyMapper.updateOaCustomFormApply(oaCustomFormApply);
return i;
}
/****
* 提交
* @param id
* @return
*/
public void submitApply(Long id){
OaCustomFormApply apply = oaCustomFormApplyService.selectOaCustomFormApplyById(id);
SysUser user = sysUserMapper.selectUserByUserName(apply.getCreateBy());
Map<String,Object> vars = FlowUtil.buildFlowVars(apply.getApplyTitle(),apply.getCreateBy(),user.getNickName(),
DateUtil.formatDateTime(apply.getCreateTime()), CommonConstants.YES);
String businessKey = BillTypeEnum.CUSTOM_FORM.getBillType()+":"+BillTypeEnum.CUSTOM_FORM.getTableName()+":"+id;
String insId = oaCustomFormApplyService.submitApply(apply.getFlowKey(),businessKey,vars);
OaCustomFormApply updateApply = new OaCustomFormApply();
updateApply.setId(id);
updateApply.setStatus(CommonConstants.FLOW_STATUS_SUBMIT);
updateApply.setFlowInsId(insId);
oaCustomFormApplyMapper.updateOaCustomFormApply(updateApply);
}
/****
* 提交
* @param defKey
* @param businessKey
* @param var
* @return
*/
public String submitApply(String defKey, String businessKey, Map<String, Object> var){
// 提交校验，可能在单据页面中提交后，再其他打开的页面的列表页中再次点击【提交】按钮，会导致重复流程实例。需要添加【提交前校验】
Long id = Long.valueOf(businessKey.split(":")[2]);
OaCustomFormApply apply = oaCustomFormApplyMapper.selectOaCustomFormApplyById(id);
if("1".equals(apply.getStatus())){//如果已经提交过了
throw new RuntimeException("流程已经提交");
}
ProcessInstance procIns = runtimeService.startProcessInstanceByKey(defKey,businessKey,var);
if(procIns!=null){
return procIns.getId();
}else{
return "";
}
}
/**
* 批量删除自定义表单申请
*
* @param ids 需要删除的自定义表单申请主键
* @return 结果
*/
public int deleteOaCustomFormApplyByIds(Long[] ids)
{
return oaCustomFormApplyMapper.deleteOaCustomFormApplyByIds(ids);
}
/****
* 撤销申请
* @param id
* @param deleteReason
*/
public void cancelApplyInsId(Long id,String deleteReason){
OaCustomFormApply apply = oaCustomFormApplyService.selectOaCustomFormApplyById(id);
String insId = apply.getFlowInsId();
if(StrUtil.isNotBlank(insId)){
flowProcessInstanceService.cancleProcesInstance(insId,deleteReason);
}
OaCustomFormApply updateApply = new OaCustomFormApply();
updateApply.setId(id);
updateApply.setStatus(CommonConstants.FLOW_STATUS_START);
updateApply.setFlowInsId("");
updateApply.setUpdateTime(new Date());
oaCustomFormApplyMapper.updateOaCustomFormApply(updateApply);
}
/**
* 删除自定义表单申请信息
*
* @param id 自定义表单申请主键
* @return 结果
*/
public int deleteOaCustomFormApplyById(Long id)
{
return oaCustomFormApplyMapper.deleteOaCustomFormApplyById(id);
}
}

91
PointLion/src/main/java/com/ruoyi/back/oa/service/OaCustomFormService.java
View File

@@ -1,91 +0,0 @@
package com.ruoyi.back.oa.service;
import com.ruoyi.back.erp.service.BaseService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.back.oa.domain.OaCustomForm;
import com.ruoyi.back.oa.mapper.OaCustomFormMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 自定义单Service业务层处理
*
* @author pointLion
* @date 2022-07-05
*/
@Service
public class OaCustomFormService extends BaseService
{
@Autowired
private OaCustomFormMapper oaCustomFormMapper;
/**
* 查询自定义单
*
* @param id 自定义单主键
* @return 自定义单
*/
public OaCustomForm selectOaCustomFormById(Long id)
{
return oaCustomFormMapper.selectOaCustomFormById(id);
}
/**
* 查询自定义单列表
*
* @param oaCustomForm 自定义单
* @return 自定义单
*/
public List<OaCustomForm> selectOaCustomFormList(OaCustomForm oaCustomForm)
{
return oaCustomFormMapper.selectOaCustomFormList(oaCustomForm);
}
/**
* 新增自定义单
*
* @param oaCustomForm 自定义单
* @return 结果
*/
public int insertOaCustomForm(OaCustomForm oaCustomForm)
{
oaCustomForm.setCreateTime(DateUtils.getNowDate());
return oaCustomFormMapper.insertOaCustomForm(oaCustomForm);
}
/**
* 修改自定义单
*
* @param oaCustomForm 自定义单
* @return 结果
*/
public int updateOaCustomForm(OaCustomForm oaCustomForm)
{
oaCustomForm.setUpdateTime(DateUtils.getNowDate());
return oaCustomFormMapper.updateOaCustomForm(oaCustomForm);
}
/**
* 批量删除自定义单
*
* @param ids 需要删除的自定义单主键
* @return 结果
*/
public int deleteOaCustomFormByIds(Long[] ids)
{
return oaCustomFormMapper.deleteOaCustomFormByIds(ids);
}
/**
* 删除自定义单信息
*
* @param id 自定义单主键
* @return 结果
*/
public int deleteOaCustomFormById(Long id)
{
return oaCustomFormMapper.deleteOaCustomFormById(id);
}
}

Some files were not shown because too many files have changed in this diff Show More