diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
index 6b07ccdf..1bda6834 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
@@ -45,6 +45,7 @@ import com.adc.da.sys.page.UserEOPage;
import com.adc.da.sys.service.IUserEOService;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.workFlow.entity.*;
+import com.adc.da.workFlow.entity.ProcessRollBackEO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml
index 889ae6ed..e87fc43a 100644
--- a/adc-da-slrs/pom.xml
+++ b/adc-da-slrs/pom.xml
@@ -137,6 +137,12 @@
com.google.code.gson
gson
+
+ org.springframework.cloud
+ spring-cloud-openfeign-core
+ 2.2.0.RELEASE
+ compile
+
diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/BusMes.java b/adc-da-slrs/src/main/java/com/adc/da/common/BusMes.java
new file mode 100644
index 00000000..a372a03a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/common/BusMes.java
@@ -0,0 +1,38 @@
+package com.adc.da.common;
+
+import lombok.Data;
+
+/**
+ * @author wxyclub
+ * @description
+ * @date 2023/12/4
+ */
+@Data
+public class BusMes {
+
+ private String userId;
+
+ private String taskId;
+
+ private String json;
+
+ private String taskIds;
+
+ private String pId;
+
+ private String prcType;
+
+ private String createUser;
+
+ private String createUserName;
+
+ private String userName;
+
+ private int size;
+
+ private int current;
+
+ private String id;
+
+ private String nowStateType;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/ProcessRollBackEO.java b/adc-da-slrs/src/main/java/com/adc/da/common/ProcessRollBackEO.java
new file mode 100644
index 00000000..fe958503
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/common/ProcessRollBackEO.java
@@ -0,0 +1,22 @@
+package com.adc.da.common;
+
+import lombok.Data;
+
+/**
+ * @author wxyclub
+ * @description
+ * @date 2023/12/4
+ */
+@Data
+public class ProcessRollBackEO {
+
+ private String json;
+
+ private String type;
+
+ private String id;
+
+ private String userId;
+
+ private String bpnId;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/WorkFlowFeignClient.java b/adc-da-slrs/src/main/java/com/adc/da/common/WorkFlowFeignClient.java
new file mode 100644
index 00000000..838456e1
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/common/WorkFlowFeignClient.java
@@ -0,0 +1,21 @@
+package com.adc.da.common;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * @author wxyclub
+ * @description
+ * @date 2023/12/4
+ */
+@FeignClient(value = "bat-wkflow", contextId = "slrs")
+public interface WorkFlowFeignClient {
+
+ @RequestMapping(value = "/bat-wkflow/activiti_define_start_user_rollBack",method = RequestMethod.POST)
+ Wrapper activiti_define_start_rollBack(@RequestBody ProcessRollBackEO processRollBackEO);
+
+ @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST)
+ Wrapper completeTaskByUserId(@RequestBody BusMes busMes);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
index fa4476ff..cd06e7e5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.esRevisePlan.controller;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ZipUtil;
import com.adc.da.common.ReadExcel;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.PageInfo;
@@ -9,25 +10,32 @@ import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService;
+import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.EsRevisePlanExportUtil;
+import com.adc.da.utils.util.FieldConvertUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
import java.util.*;
/**
@@ -50,6 +58,9 @@ public class EsRevisePlanController extends BaseController {
@Autowired
private IQualityEvaluationService qualityEvaluationService;
+ @Value("${file.path}")
+ private String filePath;
+
@ApiOperation(value = "获取所有企标计划")
@GetMapping("getAllPlans")
public ResponseMessage