Merge branch 'develop' into 'FOTON'

解读流程流程数据消失bug修复

See merge request foton-wkflow-group/foton-wkflow-rest!72

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java

@@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.listener.standardRead.vo.JSONArrayVo;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import java.text.SimpleDateFormat;

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java

@@ -69,7 +69,6 @@ public class ZrApplayAfter implements TaskListener{
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("9");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/standardRead/vo/JSONArrayVo.java

@@ -94,6 +94,20 @@ public class JSONArrayVo {
 
     private List<ParamVo> paramsList;
 
+    private String newData;
+
+    private String onlineData;
+
+    private String changePoint;
+
+    private String itemsId;
+
+    private String itemsId2;
+
+    private String technicalRequir;
+
+    private String zrUserName;
+
 
 
 }