From a471b20fe8075a663f32b3a2ee0cd70c1c63baf7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 21:59:42 +0800
Subject: [PATCH] 业务类型查询：树查询修改，数据列表查询接口修改（处理模板套模板情况下freemarker表达式的替换处理）。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 ef3ad70..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,14 +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.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;
@@ -203,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{
@@ -212,7 +212,13 @@
}
return result;
}
-
+
+ /**
+ * 鑾峰彇鏌愪釜鍒嗙被涓嬬殑userid鍙互浣跨敤鐨勬祦绋嬫ā鏉�
+ * @param type 娴佺▼鍒嗙被
+ * @param filterTemplate 鎸囧畾妯℃澘
+ * @return 鍙敤鐨勬祦绋嬫ā鐗�
+ */
@ResponseBody
@RequestMapping("/getTemplateByType")
@VciBusinessLog(operateName="鑾峰彇娴佺▼妯℃澘",notStore=true)
@@ -234,7 +240,13 @@
return BaseResult.fail("娌℃湁鍙敤鐨勭増鏈�");
}
}
-
+
+ /**
+ * 鑾峰彇娴佺▼涓畾涔夌殑鎵�鏈変换鍔¤妭鐐�
+ * @param processOid 娴佺▼妯＄増鐨勪富閿�
+ * @param maxSecret 鏁版嵁涓殑鏈�澶у瘑绾у��
+ * @return 璇ユ祦绋嬫ā鐗堜腑鎵�鏈夌殑浠诲姟鑺傜偣,鍏朵腑鍖呭惈鎵�鏈夊彲浠ラ�夋嫨鐨勭敤鎴�
+ */
@ResponseBody
@RequestMapping("/getAllProcessNode")
@VciBusinessLog(operateName="鑾峰彇娴佺▼鐨勮妭鐐�",notStore=true)
@@ -242,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