From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +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 |   47 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 37 insertions(+), 10 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 f3b3835..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
@@ -1,11 +1,14 @@
 package com.vci.web.service;
 
+import com.vci.corba.common.PLException;
 import com.vci.corba.omd.stm.StatePool;
-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 com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.pagemodel.PageHelper;
 
+import java.io.File;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -22,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);
 
     /**
      * 鏌ヨ鎵�鏈夌殑鐘舵��
@@ -54,13 +57,13 @@
      * 鎵归噺娣诲姞鐘舵��
      * @param statePoolList 鐘舵�佸唴瀹�
      */
-    void batchAddStatus(List<StatePool> statePoolList);
+    boolean batchAddStatus(List<StatePool> statePoolList) throws Exception;
 
     /**
      * 鎵归噺淇敼鐘舵��
      * @param statePoolList 鐘舵�佸唴瀹�
      */
-    void batchEditSave(List<StatePool> statePoolList);
+    boolean batchEditSave(List<StatePool> statePoolList) throws Exception;
 
     /**
      * 鐘舵�佸垪琛�
@@ -88,19 +91,19 @@
      * 娣诲姞鐘舵��
      * @param statusDTO 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄
      */
-    void addSave(OsStatusDTO statusDTO);
+    boolean addSave(OsStatusDTO statusDTO) throws Exception;
 
     /**
      * 缂栬緫鐘舵��
      * @param statusDTO 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄
      */
-    void editSave(OsStatusDTO statusDTO);
+    boolean editSave(OsStatusDTO statusDTO)throws Exception ;
 
     /**
      * 鍒犻櫎鐘舵��
-     * @param oids 涓婚敭
+     * @param osStatusDTOS
      */
-    void delete(String oids);
+    boolean deleteStatus(List<OsStatusDTO> osStatusDTOS) throws PLException;
 
     /**
      * 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄杞崲涓烘暟鎹璞�
@@ -108,4 +111,28 @@
      * @return 骞冲彴鐨勬暟鎹璞�
      */
     StatePool statusDTO2DO(OsStatusDTO statusDTO);
+
+    /**
+     * 瀵煎嚭閫変腑鐨勭姸鎬�
+     * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
+     * @param statusOids 闇�瑕佸鍑虹殑灞炴�у悕绉�
+     * @return
+     */
+    String exportStatus(String exportFileName,String statusOids,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException;
+
+    /**
+     * 涓嬭浇鐘舵�佸鍏ユā鏉�
+     * @param exportFileName
+     * @return
+     * @throws PLException
+     */
+    String downloadStatusTemplate(String exportFileName) throws Exception;
+
+    /**
+     * 瀵煎叆鐘舵��
+     * @param file
+     * @return
+     */
+    BaseResult importStatus(File file) throws Exception;
+
 }

--
Gitblit v1.9.3