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

fix(稽查流程): 80760

Browse Source
This commit is contained in:
yjz
2024-01-15 09:11:36 +08:00
parent 965e617579
commit 17f721cfd2
8 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java
+1 -1
View File
@@ -226,7 +226,7 @@ public class ProcessAspect {
processDraft.setSaveSource(REVOCATION);
processDraft.setInfoJsonStr(processDraft.getInfoJsonStr().replaceFirst("\\{", "{\"revocation\": true,"));
processDraftService.save(processDraft);
if (jp.getSignature().getName().equals("flowStart")){
// 发起后删除草稿
processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java
+3 -1
View File
@@ -183,7 +183,9 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
// 是否存在草稿
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, projectId)
.eq(ProcessDraft::getUserId, loginUser.getId()));
.eq(ProcessDraft::getUserId, loginUser.getId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (!processDraftList.isEmpty()){
String id = "";
if(Objects.isNull(processAll)){
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+3 -1
View File
@@ -250,7 +250,9 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
// 是否存在草稿
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, projectId)
.eq(ProcessDraft::getUserId, loginUser.getId()));
.eq(ProcessDraft::getUserId, loginUser.getId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (!processDraftList.isEmpty()){
String id = "";
if(Objects.isNull(processAll)){
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
+3 -1
View File
@@ -176,7 +176,9 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
// 是否存在草稿
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, projectId)
.eq(ProcessDraft::getUserId, loginUser.getId()));
.eq(ProcessDraft::getUserId, loginUser.getId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (!processDraftList.isEmpty()){
String id = "";
if(Objects.isNull(processAll)){
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
+3 -1
View File
@@ -228,7 +228,9 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
// 是否存在草稿
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, projectId)
.eq(ProcessDraft::getUserId, loginUser.getId()));
.eq(ProcessDraft::getUserId, loginUser.getId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (!processDraftList.isEmpty()){
String id = "";
if(Objects.isNull(processAll)){
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
+3 -1
View File
@@ -143,7 +143,9 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
// 是否存在草稿
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, projectId)
.eq(ProcessDraft::getUserId, loginUser.getId()));
.eq(ProcessDraft::getUserId, loginUser.getId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (!processDraftList.isEmpty()){
String id = "";
if(Objects.isNull(processAll)){
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
+3 -1
View File
@@ -152,7 +152,9 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
// 是否存在草稿
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, projectId)
.eq(ProcessDraft::getUserId, loginUser.getId()));
.eq(ProcessDraft::getUserId, loginUser.getId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (!processDraftList.isEmpty()){
String id = "";
if(Objects.isNull(processAll)){
laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
+3 -1
View File
@@ -171,7 +171,9 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
// 是否存在草稿
List<ProcessDraft> processDraftList = processDraftService.list(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, projectId)
.eq(ProcessDraft::getUserId, loginUser.getId()));
.eq(ProcessDraft::getUserId, loginUser.getId())
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
.or().isNull(ProcessDraft::getSaveSource)));
if (!processDraftList.isEmpty()){
String id = "";
if(Objects.isNull(processAll)){