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 7f3a2975..f11e53a1 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
@@ -18,6 +18,8 @@ import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
+import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.sys.common.EmailUtils;
@@ -91,6 +93,9 @@ public class WorkFlowController {
     @Autowired
     private SarAgenldAcceptButtonServiceImpl sarAgenldAcceptButtonService;
 
+    @Autowired
+    private TsInstitutionDao tsInstitutionDao;
+
 //    @Autowired
 //    private ExportExcelMapper exportExcelMapper;
 
@@ -1024,32 +1029,26 @@ public class WorkFlowController {
         for (EsRevisePlan data : esRevisePlans){
             //数据拼接
             ProcessRollBackEO processRollBackEO = new ProcessRollBackEO();
-            processRollBackEO.setUserId(userId);
+            //起草人
+            processRollBackEO.setUserId(data.getDrafter());
             processRollBackEO.setType("25");
             //拼接json
             HashMap<String, Object> qbfsForm = new HashMap<>();
             HashMap<String, Object> qbfsFormInfo = new HashMap<>();
-            qbfsForm.put("bussSort",data.getBussSort());
-            qbfsForm.put("esMatingRelations",data.getEsMatingRelations());
-            qbfsForm.put("technologic",data.getTechnologic());
-            qbfsForm.put("useLevel",data.getUseLevel());
-            qbfsForm.put("isRelate",data.getIsRelate());
-            qbfsForm.put("esStandRelations",data.getEsStandRelations());
-            //数组格式
-             String[] split = data.getArea().split(",");
-            qbfsForm.put("area",split);
-            qbfsForm.put("tsJson",data.getTsJson());
-            qbfsForm.put("tsJsonName",data.getTsJsonName());
-            qbfsForm.put("rqbJson",data.getRqbJson());
-            qbfsForm.put("rqbName",data.getRqbName());
-            qbfsForm.put("unit",data.getUnit());
-            qbfsForm.put("unitName",data.getUnitName());
+
             qbfsForm.put("esName",data.getEsName());
             qbfsForm.put("planStatus",data.getPlanStatus());
             qbfsForm.put("reviseStatus",data.getReviseStatus());
+            qbfsForm.put("drafter",data.getDrafter());
+            TsUser byIdDrafter = userService.getById(data.getDrafter());
+            if(byIdDrafter!=null){
+                qbfsForm.put("drafterName",byIdDrafter.getUname());
+            }
             qbfsForm.put("resPerson",data.getResPerson());
-            qbfsForm.put("resPersonName",data.getResPersonName());
-
+            TsUser byIdResPrson = userService.getById(data.getResPerson());
+            if(byIdResPrson!=null){
+                qbfsForm.put("resPersonName",byIdResPrson.getUname());
+            }
             String wgLeaderStr = data.getWgLeader();
             if(wgLeaderStr!=null){
                 if(wgLeaderStr.endsWith(",")){
@@ -1057,17 +1056,49 @@ public class WorkFlowController {
                 }
             }
             qbfsForm.put("wgLeader",wgLeaderStr);
-            qbfsForm.put("wgLeaderName",data.getWgLeaderName());
+            qbfsForm.put("resPerson",data.getResPerson());
+            TsUser byIdWgleader = userService.getById(data.getResPerson());
+            if(byIdWgleader!=null){
+                qbfsForm.put("wgLeaderName",byIdWgleader.getUname());
+            }
+
+            qbfsForm.put("standId",data.getStandId());
+            qbfsForm.put("actualTime",data.getActualTime());
+            qbfsForm.put("standNumber",data.getStandNumber());
             qbfsForm.put("draftTime",simpleDateFormat.format(data.getDraftTime()));
             qbfsForm.put("releaseTime",simpleDateFormat.format(data.getReleaseTime()));
-            qbfsForm.put("drafter",data.getDrafter());
-            qbfsForm.put("drafterName",data.getDrafterName());
+
+            //争议
+            qbfsForm.put("unit",data.getUnit());
+            TsInstitution tsInstitution = tsInstitutionDao.selectById(data.getUnit());
+            if(tsInstitution!=null){
+                qbfsForm.put("unitName",tsInstitution.getName());
+            }
+
+            qbfsForm.put("rqbJson",data.getRqbJson());
+            qbfsForm.put("rqbName",data.getRqbName());
+            qbfsForm.put("rqbCode",data.getRqbCode());
+            qbfsForm.put("tsJson",data.getTsJson());
+            qbfsForm.put("tsJsonName",data.getTsJsonName());
+            qbfsForm.put("area",data.getArea());
+            qbfsForm.put("areaName",data.getAreaName());
+            qbfsForm.put("standType",data.getStandType());
+            qbfsForm.put("standNum",data.getStandNum());
+            qbfsForm.put("esMatingRelations",data.getEsMatingRelations());
+            qbfsForm.put("esStandRelations",data.getEsStandRelations());
+            qbfsForm.put("isRelate",data.getIsRelate());
+            qbfsForm.put("useLevel",data.getUseLevel());
+            TsUser byIdUseLevel = userService.getById(data.getUseLevel());
+            if(byIdUseLevel!=null){
+                qbfsForm.put("useLevelName",data.getUseLevelName());
+            }
+
+            qbfsForm.put("technologic",data.getTechnologic());
+            qbfsForm.put("bussSort",data.getBussSort());
+            qbfsForm.put("lxdName","");
+            qbfsForm.put("lxd",data.getLxd());
             qbfsForm.put("LXD",data.getLxd());
             qbfsForm.put("LXDName","");
-            //争议
-            qbfsForm.put("lxd","");
-            //争议
-            qbfsForm.put("lxdName","立项单");
             qbfsForm.put("addFlag","1");
             if(jsonObject.get("prcCreateUser")!=null){
                 qbfsForm.put("prcCreateUser",jsonObject.get("prcCreateUser").toString());
@@ -1084,10 +1115,12 @@ public class WorkFlowController {
                 BusMes busMes = new BusMes();
                 busMes.setPrcType("25");
                 busMes.setTaskIds(taskId);
-                busMes.setCreateUserName(userName);
-                if(jsonObject.get("prcCreateUser")!=null){
-                    busMes.setUserId(jsonObject.get("prcCreateUser").toString());
-                }
+//                busMes.setCreateUserName(userName);
+//                if(jsonObject.get("prcCreateUser")!=null){
+//                    busMes.setUserId(jsonObject.get("prcCreateUser").toString());
+//                }
+                busMes.setCreateUserName(data.getDrafterName());
+                busMes.setUserId(data.getDrafter());
                 busMes.setJson(jsonMap);
                 Wrapper<String> stringWrapper = completeTaskByUserId(busMes);
             }