From 3ef0ee19b5991ee38ec6404a36c325171014f7fa Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 07 一月 2025 18:01:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
index 4b1b4a7..f479364 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
@@ -2,11 +2,11 @@
import com.vci.corba.common.PLException;
import com.vci.corba.omd.stm.StatePool;
+import com.vci.dto.OsStatusDTO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.dto.OsStatusDTO;
-import com.vci.pagemodel.OsStatusVO;
import java.io.File;
import java.util.Collection;
@@ -25,14 +25,14 @@
* @param statePool 鐘舵�佹睜鐨勬暟鎹璞�
* @return 鏄剧ず瀵硅薄
*/
- OsStatusVO statusDO2VO(com.vci.corba.omd.stm.StatePool statePool);
+ OsStatusVO statusDO2VO(StatePool statePool);
/**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param statePools 鐘舵�佹睜鐨勬暟鎹璞� 闆嗗悎
* @return 鏄剧ず瀵硅薄
*/
- List<OsStatusVO> statusDO2VOs(Collection<com.vci.corba.omd.stm.StatePool> statePools);
+ List<OsStatusVO> statusDO2VOs(Collection<StatePool> statePools);
/**
* 鏌ヨ鎵�鏈夌殑鐘舵��
@@ -118,7 +118,7 @@
* @param statusOids 闇�瑕佸鍑虹殑灞炴�у悕绉�
* @return
*/
- String exportStatus(String exportFileName,String statusOids) throws PLException;
+ String exportStatus(String exportFileName,String statusOids,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException;
/**
* 涓嬭浇鐘舵�佸鍏ユā鏉�
--
Gitblit v1.9.3