From 246494c9cfe6b1dea970c48c358f74813c7bd540 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Mon, 28 Nov 2022 11:19:44 +0800
Subject: [PATCH] .

---
 .../TAbilityApplicationController.java         |  7 +++++++
 .../listener/v3/CorrectionListenerV3.java      | 18 +++++++++---------
 .../service/TAbilityApplicationService.java    |  2 ++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
index 1a45633e..19ff79dd 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
@@ -617,4 +617,11 @@ public class TAbilityApplicationController {
     }
 
 
+    @GetMapping("/getApplyPriceCount")
+    @ApiOperation("资金报表大屏获取总节约资金")
+    @LogOperation("资金报表大屏获取总节约资金")
+    public Result getApplyPriceCount() {
+        return new Result().ok(tAbilityApplicationService.getApplyPriceCount());
+    }
+
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java
index 7875beb3..6a09caa0 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java
@@ -236,15 +236,15 @@ public class CorrectionListenerV3 implements TaskListener, ExecutionListener, Ac
 
         List<HistoricActivityInstance> historicActivityInstanceList = historyService.createHistoricActivityInstanceQuery().processInstanceId(delegateTask.getProcessInstanceId())
                 .activityType("userTask").unfinished().orderByHistoricActivityInstanceEndTime().desc().list();
-        //if (!historicActivityInstanceList.isEmpty() && historicActivityInstanceList.get(0).getAssignee().equals(assignee)) {
-        //    taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过");
-        //    taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE);
-        //    taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE);
-        //    taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId());
-        //    taskService.complete(delegateTask.getId(), delegateTask.getVariables());
-        //    sysNoticeService.updateApplyStateById(delegateTask.getProcessInstanceId(), 1);
-        //    return;
-        //}
+        if (!historicActivityInstanceList.isEmpty() && historicActivityInstanceList.get(0).getAssignee().equals(assignee)) {
+            taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过");
+            taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE);
+            taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE);
+            taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId());
+            taskService.complete(delegateTask.getId(), delegateTask.getVariables());
+            sysNoticeService.updateApplyStateById(delegateTask.getProcessInstanceId(), 1);
+            return;
+        }
 
         List<TAbilityApplicationDTO> dtoList = delegateTask.getVariable("tAbilityApplicationDTOList", List.class);
         Optional<TAbilityApplicationDTO> tAbilityApplicationDTO = dtoList.stream().filter(index -> {
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java
index 63bd6236..f763b77f 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java
@@ -84,4 +84,6 @@ public interface TAbilityApplicationService extends CrudService<TAbilityApplicat
     Object getProvideDistrictFundStatement(Map<String, Object> params);
 
     Object getApplyDistrictFundStatement(Map<String, Object> params);
+
+    Object getApplyPriceCount();
 }
\ No newline at end of file