ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 流程办理草稿变更 2024/1/3

Browse Source
This commit is contained in:
mzaxd
2024-01-03 15:45:44 +08:00
parent 9b631000bf
commit a02383ab16
10 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+9
View File
@@ -354,6 +354,15 @@ public class ActFlowCommonService {
return processDraftService.getOne(draftWrapper);
}
public ProcessDraft getExistDraftByTaskId(String taskId, ProcessTypeEnum processTypeEnum) {
String userId = UserUtils.getUserId();
LambdaQueryWrapper<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();
draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue());
draftWrapper.eq(ProcessDraft::getUserId, userId);
draftWrapper.eq(ProcessDraft::getTaskId, taskId);
return processDraftService.getOne(draftWrapper);
}
public void getExistDraftAndRemove(CommonVO common, ProcessTypeEnum processTypeEnum) {
String taskId = common.getTaskId();
String userId = UserUtils.getUserId();
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java
+5
View File
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
@@ -88,6 +89,10 @@ public class ESAbolishController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ABOLISH);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(abolishService.getHandleData(taskId));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
+5
View File
@@ -7,6 +7,7 @@ import com.jero.common.aspect.annotation.Translation;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
@@ -96,6 +97,10 @@ public class ESAnnualInitController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ANNUAL_INIT);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(annualInitService.getHandleData(taskId));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
+5
View File
@@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.Translation;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
@@ -133,6 +134,10 @@ public class ESAnnualReportController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable(value = "taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ANNUAL_REPORT);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(annualReportService.getHandleData(taskId));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java
+5
View File
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -73,6 +74,10 @@ public class ESArchiveController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ARCHIVE);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(archiveService.getHandleData(taskId));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java
+5
View File
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -74,6 +75,10 @@ public class ESChangeController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_CHANGE);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(changeService.getHandleData(taskId));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java
+5
View File
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -86,6 +87,10 @@ public class ESEnableController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ENABLE);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(enableService.getHandleData(taskId));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+6 -1
View File
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -102,6 +103,10 @@ public class ProcessESInitChangeController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_INIT_CHANGE);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(initChangeService.getHandleData(taskId));
}
@@ -115,7 +120,7 @@ public class ProcessESInitChangeController {
@GetMapping("/draftHandle")
@Translation
public Result<?> draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) {
return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_INIT_CHANGE));
return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_INIT_CHANGE));
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
+5
View File
@@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
@@ -80,6 +81,10 @@ public class ESRecheckController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_RECHECK);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(recheckService.getHandleData(taskId));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java
+5
View File
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO;
@@ -73,6 +74,10 @@ public class ESRevisionController {
@GetMapping("/handle/{taskId}")
@Translation
public Result<?> handle(@PathVariable("taskId") String taskId) {
ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_REVISION);
if (draft != null) {
return Result.OK(draft);
}
return Result.OK(revisionService.getHandleData(taskId));
}