From c0b116a413ff26775176017674948969c26f2d2a Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 16 八月 2024 11:33:35 +0800
Subject: [PATCH] 1、新增链接类型查询模板的普通、高级保存接口的编写及测试,以及查询显示接口的变动。 2、新增链接类型查询模板树查询,用于界面的导出功能接口。 3、新增链接类型查询模板导出功能。 4、新增链接类型查询模板导入功能这里上传文件直接导入了数据并返回了相关导入结果。 5、新增链接类型查询模板删除接口。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
index 769146a..792a964 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
@@ -1,15 +1,14 @@
 package com.vci.web.controller;
 
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.ProcessTemplateVO;
+import com.vci.pagemodel.*;
+import com.vci.pagemodel.KeyValue;
 import com.vci.starter.web.annotation.bus.VciNoUseBaseResult;
 import com.vci.starter.web.annotation.controller.VciUnCheckRight;
 import com.vci.starter.web.annotation.log.VciBusinessLog;
 import com.vci.starter.web.annotation.permission.VciReferPermission;
-import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.*;
 import com.vci.starter.web.util.ControllerUtil;
-import com.vci.web.pageModel.*;
-import com.vci.web.pageModel.KeyValue;
 import com.vci.web.service.WebProcessDefineServiceI;
 import com.vci.web.util.WebUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -204,7 +203,7 @@
 	public BaseResult getOutcomes(String taskOid){
 		 List<ProcessOutcomeVO> allOutcomes = proDefineService.getOutCome(taskOid, true);
 		BaseResult result = BaseResult.success();
-		result.setObj(allOutcomes);
+		result.setData(allOutcomes);
 		 if(allOutcomes !=null && allOutcomes.size()>0){
 			 result.setSuccess(true);
 		 }else{
@@ -255,7 +254,9 @@
 		try{
 			List<ProcessNodeVO> allNode = proDefineService.getAllProcessNode(processOid, true,maxSecret);
 			if(allNode!=null && allNode.size()>0){
-				return BaseResult.success(allNode);
+				BaseResult baseResult = BaseResult.success();
+				baseResult.setData(allNode);
+				return baseResult;
 			}else{
 				return BaseResult.fail("鏁版嵁鏈夎锛屾病鎵惧埌娴佺▼鐨勮妭鐐�");
 			}

--
Gitblit v1.9.3