wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-07 11:53:56 +08:00
parent 816bf600ad fc715c9cd4
commit 8844a9fdf2
8 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/modules/demanData/listener/DemandDataListener.java
View File

@ -166,6 +166,11 @@ public class DemandDataListener implements TaskListener, ExecutionListener, Acti
&& StringUtils.isNotEmpty(demandDataDTO.getApplyUserId())
&& demandDataDTO.getApplyUserId().equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}

5
renren-admin/src/main/java/io/renren/modules/demandComment/listener/CommentListener.java
View File

@ -157,6 +157,11 @@ public class CommentListener implements TaskListener, ExecutionListener, Activit
&& StringUtils.isNotEmpty(tDemandCommentDTO.getCreator().toString())
&& tDemandCommentDTO.getCreator().toString().equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}
}

5
renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
View File

@ -228,6 +228,11 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
&& StringUtils.isNotEmpty(abilityApplicationDTO.getUserId())
&& abilityApplicationDTO.getUserId().equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}
}

5
renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java
View File

@ -140,6 +140,11 @@ public class DataCenterListener implements TaskListener, ExecutionListener, Acti
&& StringUtils.isNotEmpty(abilityApplicationDTO.getUserId())
&& abilityApplicationDTO.getUserId().equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}

5
renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java
View File

@ -208,6 +208,11 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
&& StringUtils.isNotEmpty(delegateTask.getVariable("creator", String.class))
&& delegateTask.getVariable("creator", String.class).equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}
}

5
renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/DataCenterListenerV2.java
View File

@ -110,6 +110,11 @@ public class DataCenterListenerV2 implements TaskListener, ExecutionListener, Ac
&& StringUtils.isNotEmpty(delegateTask.getVariable("creator", String.class))
&& delegateTask.getVariable("creator", String.class).equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}
}

5
renren-admin/src/main/java/io/renren/modules/resource/listener/ResourceUndercarriageListener.java
View File

@ -149,6 +149,11 @@ public class ResourceUndercarriageListener implements TaskListener, ExecutionLis
&& StringUtils.isNotEmpty(re.getCreator().toString())
&& re.getCreator().toString().equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}
}

5
renren-admin/src/main/java/io/renren/modules/resourceMountApply/listener/ResourceOwnerListener.java
View File

@ -227,6 +227,11 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
&& StringUtils.isNotEmpty(resourceMountApplyDTO.getUserId())
&& resourceMountApplyDTO.getUserId().equals(assignee)) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人为发起人，默认通过");
try {
Thread.sleep(100l);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
taskService.complete(delegateTask.getId(), delegateTask.getVariables());
}
}