From fc2257a747de34f1aad007d4041749ea68ef7d1c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 11 Dec 2023 15:35:11 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2-=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ESAnnualReportController.java          |  4 +++-
 .../impl/ProcessEsAnnualReportServiceImpl.java        | 11 +++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
index ec43c70b..ea2a204e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
@@ -1,9 +1,11 @@
 package com.jero.modules.activiti.process.esAnnualReport.controller;
 
 import com.jero.common.api.vo.Result;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
 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.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
@@ -85,7 +87,7 @@ public class ESAnnualReportController {
             return Result.OK(dataList);
         } else {
             List<String> msg = (List<String>) resultMap.get("msg");
-            return Result.error("导入失败", msg);
+            return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), msg);
         }
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 2189fad8..c3e6d249 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -79,9 +79,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
     @Resource
     private TaskService taskService;
 
-    @Resource
-    private EnterpriseStandardUtil esUtil;
-
     @Override
     public void startProcess(AnnualReportDataVO annualReportData) {
         // 流程Key
@@ -154,7 +151,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String taskName = task.getName();
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         switch (taskName) {
             case CONTACT_USER_DISTRIBUTE:
                 ProcessEsAnnualReport annualReport = annualReportDataVO.getDataList().get(0);
@@ -217,17 +213,16 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
     @Override
     public AnnualReportDataVO getHandleData(String taskId) {
         String userId = UserUtils.getUserId();
+        if (!actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException("任务不存在");
+        }
         String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
         // 根据当前执行Id获取所有子执行Id
         List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);
         executionIdList.add(executionId);
-        if (!actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException("任务不存在");
-        }
         AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         // 获取流程通用数据
         ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
         CommonVO commonVO = new CommonVO();