From bbf34989894913f3db3f785c79d30069397ce11e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 七月 2024 15:02:07 +0800
Subject: [PATCH] 属性池、状态池、枚举导出列名调整，可通过变量控制导出的列名是否和导入模板的一致；版本管理查询、查看应用范围接口上传。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java |   73 ++++++++++
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java            |    3 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java         |   24 +++
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java               |    2 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java       |    2 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java                 |    3 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java    |  102 ++++++++++++++
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java           |    2 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java         |  105 ++++++++++----
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java       |   22 ++
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java       |    2 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java    |   62 +++++---
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsAttributePO.java                       |    2 
 13 files changed, 338 insertions(+), 66 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsAttributePO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsAttributePO.java
index d64806f..7ee9fb7 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsAttributePO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsAttributePO.java
@@ -52,7 +52,7 @@
     /**
      * 灞炴�х被鍨�
      */
-    @ExcelColumn(value="灞炴�х被鍨�(璇峰弬鐓ф柊澧炵晫闈㈢殑灞炴�х被鍨嬪～鍐�)",nullable = false)
+    @ExcelColumn(value="灞炴�х被鍨�(鍙傜収鏂板鐣岄潰鐨勫睘鎬х被鍨嬪VTString)",nullable = false)
     private String attributeDataType;
 
     /**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
index adf0e3e..ae35b5d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsAttributeController.java
@@ -164,7 +164,7 @@
     @VciBusinessLog(operateName = "瀵煎嚭灞炴��")
     public void exportAttributes(String exportFileName,String attrNames, HttpServletResponse response){
         try {
-            String excelPath = attributeService.exportAttributes(exportFileName,attrNames);
+            String excelPath = attributeService.exportAttributes(exportFileName,attrNames,false);
             ControllerUtil.writeFileToResponse(response,excelPath);
         } catch (Exception e) {
             String msg = "瀵煎嚭鏋氫妇鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java
new file mode 100644
index 0000000..7e178b4
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsRevisionRuleController.java
@@ -0,0 +1,102 @@
+package com.vci.web.controller;
+
+import com.vci.dto.OsRevisionRuleDTO;
+import com.vci.pagemodel.OsRevisionRuleVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
+import com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.util.VciBaseUtil;
+import com.vci.web.service.OsRevisionRuleServiceI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鐗堟湰瑙勫垯鎺у埗鍣�
+ * @author ludc
+ * @date 2024/7/30 16:02
+ */
+@RequestMapping("/revisionRuleController")
+@RestController
+public class OsRevisionRuleController {
+
+    @Autowired
+    private OsRevisionRuleServiceI revisionRuleServiceI;
+
+    /**
+     * 鏃ュ織
+     */
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    /**
+     * 鐗堟湰瑙勫垯鍒楄〃(鍏ㄦ煡璇�)
+     * @return
+     */
+    @GetMapping("/getVersionRuleAllList")
+    @VciUnCheckRight
+    public BaseResult getVersionRuleAllList(){
+        try {
+            return BaseResult.dataList(revisionRuleServiceI.selectAllRevision());
+        }catch (Exception e) {
+            e.printStackTrace();
+            String exceptionMessage = "鐗堟湰瑙勫垯绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+    /**
+     * 鏌ヨ搴旂敤鑼冨洿
+     * @param vrName 鐗堟湰瑙勫垯鑻辨枃鍚嶇О
+     * @return
+     */
+    @GetMapping("/getUsedVersionRuleList")
+    @VciUnCheckRight
+    public BaseResult getUsedVersionRuleList(String vrName){
+        try {
+            return BaseResult.dataList(revisionRuleServiceI.getUsedVersionRuleList(vrName));
+        }catch (Exception e) {
+            e.printStackTrace();
+            String exceptionMessage = "鐗堟湰瑙勫垯搴旂敤鑼冨洿鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+    /**
+     * 鍒涘缓鐗堟湰瑙勫垯
+     * @param osRevisionRuleDTO 鐗堟湰瑙勫垯鏁版嵁浼犺緭瀵硅薄
+     * @return
+     */
+    @PostMapping("/addVersionRule")
+    @VciUnCheckRight
+    public BaseResult addVersionRule(@RequestBody OsRevisionRuleDTO osRevisionRuleDTO){
+        try {
+            return revisionRuleServiceI.addVersionRule(osRevisionRuleDTO) ? BaseResult.success("鐗堟湰瑙勫垯娣诲姞鎴愬姛锛�"):BaseResult.fail("鐗堟湰瑙勫垯娣诲姞澶辫触锛�");
+        }catch (Exception e) {
+            e.printStackTrace();
+            String exceptionMessage = "澧炲姞灞炴�ф椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+    /**
+     * 淇敼鐗堟湰瑙勫垯
+     * @param osRevisionRuleDTO 鐗堟湰瑙勫垯鏁版嵁浼犺緭瀵硅薄
+     * @return
+     */
+    @PostMapping("/updateVersionRule")
+    @VciUnCheckRight
+    public BaseResult updateVersionRule(@RequestBody OsRevisionRuleDTO osRevisionRuleDTO){
+        try {
+            return revisionRuleServiceI.updateVersionRule(osRevisionRuleDTO) ? BaseResult.success("鐗堟湰瑙勫垯娣诲姞鎴愬姛锛�"):BaseResult.fail("鐗堟湰瑙勫垯娣诲姞澶辫触锛�");
+        }catch (Exception e) {
+            e.printStackTrace();
+            String exceptionMessage = "澧炲姞灞炴�ф椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
index 2371ba8..31076f5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/VciOsStatusController.java
@@ -165,7 +165,7 @@
     @VciBusinessLog(operateName = "瀵煎嚭鐘舵��")
     public void exportStatus(String exportFileName,String statusOids, HttpServletResponse response){
         try {
-            String excelPath = statusService.exportStatus(exportFileName,statusOids);
+            String excelPath = statusService.exportStatus(exportFileName,statusOids,true);
             ControllerUtil.writeFileToResponse(response,excelPath);
         } catch (Exception e) {
             String msg = "瀵煎嚭鐘舵�佹椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
index a8048f4..971c715 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebEnumController.java
@@ -216,7 +216,7 @@
 	@VciBusinessLog(operateName = "瀵煎嚭鏋氫妇绫诲瀷")
 	public void exportEnumTypes(String exportFileName,String enumNames, HttpServletResponse response){
 		try {
-			String excelPath = enumService.exportEnumTypes(exportFileName,enumNames);
+			String excelPath = enumService.exportEnumTypes(exportFileName,enumNames,false);
 			ControllerUtil.writeFileToResponse(response,excelPath);
 		} catch (Exception e) {
 			String msg = "瀵煎嚭鏋氫妇鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
index b1e782f..2f45519 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
@@ -150,9 +150,10 @@
 	 * 瀵煎嚭閫変腑鐨勫睘鎬�
 	 * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
 	 * @param attrNames 闇�瑕佸鍑虹殑灞炴�у悕绉�
+	 * @param flag 鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�
 	 * @return
 	 */
-	String exportAttributes(String exportFileName,String attrNames) throws PLException;
+	String exportAttributes(String exportFileName,String attrNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException;
 
 	/**
 	 * 涓嬭浇灞炴�у鍏ユā鏉�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
index 7d53a23..3c19f39 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
@@ -110,9 +110,10 @@
 	 * 瀵煎嚭鏋氫妇绫诲瀷
 	 * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
 	 * @param enumNames 闇�瑕佸鍑虹殑鏋氫妇鍚嶇О
+	 * @param flag 鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�
 	 * @return
 	 */
-	String exportEnumTypes(String exportFileName,String enumNames) throws PLException;
+	String exportEnumTypes(String exportFileName,String enumNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException;
 
 	/**
 	 * 瀵煎叆鏋氫妇
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
index b32a874..34e638b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
@@ -1,6 +1,8 @@
 package com.vci.web.service;
 
+import com.vci.corba.common.PLException;
 import com.vci.corba.omd.vrm.VersionRule;
+import com.vci.dto.OsRevisionRuleDTO;
 import com.vci.pagemodel.OsRevisionRuleVO;
 
 import java.util.Collection;
@@ -27,6 +29,20 @@
     Map<String,OsRevisionRuleVO> selectAllRevisionMap();
 
     /**
+     * 鍒涘缓鐗堟湰瑙勫垯
+     * @param osRevisionRuleDTO
+     * @return
+     */
+    boolean addVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) throws PLException;
+
+    /**
+     * 淇敼鐗堟湰瑙勫垯
+     * @param osRevisionRuleDTO
+     * @return
+     */
+    boolean updateVersionRule(OsRevisionRuleDTO osRevisionRuleDTO);
+
+    /**
      * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
      * @param versionRules 鏁版嵁瀵硅薄
      * @return 鏄剧ず瀵硅薄
@@ -46,4 +62,12 @@
      * @return 鏄剧ず瀵硅薄
      */
     OsRevisionRuleVO getRevisionRuleById(String id);
+
+    /**
+     * 鏌ヨ搴旂敤鑼冨洿
+     * @param vrName 鐗堟湰瑙勫垯鑻辨枃鍚嶇О
+     * @return
+     */
+    List<Map<String, String>> getUsedVersionRuleList(String vrName) throws PLException;
+
 }
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..f003a48 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
@@ -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;
 
     /**
      * 涓嬭浇鐘舵�佸鍏ユā鏉�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 8b6c442..0f92bad 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -7,6 +7,7 @@
 import com.vci.client.mw.ClientSessionUtility;
 import com.vci.corba.common.PLException;
 import com.vci.corba.omd.atm.AttributeDef;
+import com.vci.corba.omd.vrm.VersionRule;
 import com.vci.dto.OsAttributeDTO;
 import com.vci.dto.OsEnumDTO;
 import com.vci.dto.OsEnumItemDTO;
@@ -866,22 +867,18 @@
 	 * 瀵煎嚭閫変腑鐨勫睘鎬�
 	 * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
 	 * @param attrNames 闇�瑕佸鍑虹殑灞炴�у悕绉�
+	 * @param flag 鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�
 	 * @return
 	 */
 	@Override
-	public String exportAttributes(String exportFileName, String attrNames) throws PLException {
+	public String exportAttributes(String exportFileName, String attrNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException {
 		if(Func.isBlank(attrNames)){
 			throw new PLException("500",new String[]{"璇峰嬀閫夎瀵煎嚭鐨勫睘鎬�!"});
 		}
 		//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
 		exportFileName = Func.isBlank(exportFileName) ?  "灞炴�ф睜涓睘鎬у鍑篲" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
 		//璁剧疆鍒楀悕
-		List<String> columns = new ArrayList<>(
-				Arrays.asList("灞炴�у悕", "鏍囩", "鎻忚堪",
-						"灞炴�х被鍨�", "鍏佽涓虹┖", "榛樿鍊�", "浣跨敤鐨勬灇涓捐嫳鏂囧悕绉�(鏋氫妇鍚�)",
-						"浣跨敤鐨勬灇涓句腑鏂囧悕绉�(鏍囩)", "鍙傜収鐨勪笟鍔＄被鍨嬬紪鍙�", "鍙傜収鐨勪笟鍔＄被鍨嬪悕绉�",
-						"鍙傜収鐨勯摼鎺ョ被鍨嬪悕绉�","鐗堟湰鐗堟","灞炴�ч暱搴�", "灏忔暟绮惧害浣嶆暟","灏忔暟鍒诲害浣嶆暟","鍙栧�艰寖鍥�","鍒涘缓鏃堕棿")
-		);
+		List<String> columns = this.getCloumns(flag);
 
 		//鍐檈xcel
 		String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
@@ -913,21 +910,46 @@
 				excelDataList.add(new WriteExcelData(i+1,4, osAttributeVO.isNullableFlag()));
 				excelDataList.add(new WriteExcelData(i+1,5, osAttributeVO.getDefaultValue()));
 				excelDataList.add(new WriteExcelData(i+1,6, osAttributeVO.getEnumId()));
-				excelDataList.add(new WriteExcelData(i+1,7, osAttributeVO.getEnumName()));
-				excelDataList.add(new WriteExcelData(i+1,8, osAttributeVO.getBtmTypeId()));
-				excelDataList.add(new WriteExcelData(i+1,9, osAttributeVO.getBtmTypeName()));
-				excelDataList.add(new WriteExcelData(i+1,10, osAttributeVO.getAttrLength()));
-				excelDataList.add(new WriteExcelData(i+1,11, osAttributeVO.getLinkTypeName()));
-				excelDataList.add(new WriteExcelData(i+1,12, osAttributeVO.getVersion()));
-				excelDataList.add(new WriteExcelData(i+1,13, osAttributeVO.getPrecisionLength()));
-				excelDataList.add(new WriteExcelData(i+1,14, osAttributeVO.getScaleLength()));
-				excelDataList.add(new WriteExcelData(i+1,15, osAttributeVO.getRange()));
-				excelDataList.add(new WriteExcelData(i+1,16, osAttributeVO.getCreateTime()));
+				//excelDataList.add(new WriteExcelData(i+1,7, osAttributeVO.getEnumName()));
+				excelDataList.add(new WriteExcelData(i+1,7, osAttributeVO.getBtmTypeId()));
+				//excelDataList.add(new WriteExcelData(i+1,9, osAttributeVO.getBtmTypeName()));
+				excelDataList.add(new WriteExcelData(i+1,8, osAttributeVO.getAttrLength()));
+				excelDataList.add(new WriteExcelData(i+1,9, osAttributeVO.getLinkTypeName()));
+				excelDataList.add(new WriteExcelData(i+1,10, osAttributeVO.getVersion()));
+				excelDataList.add(new WriteExcelData(i+1,11, osAttributeVO.getPrecisionLength()));
+				excelDataList.add(new WriteExcelData(i+1,12, osAttributeVO.getScaleLength()));
+				excelDataList.add(new WriteExcelData(i+1,13, osAttributeVO.getRange()));
+				if(!flag){
+					excelDataList.add(new WriteExcelData(i+1,14, Func.format(osAttributeVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
+				}
 			}
 		}
 		WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
 		ExcelUtil.writeDataToFile(excelPath, excelOption);
 		return excelPath;
+	}
+
+	/**
+	 * 鑾峰彇瀵煎嚭鎴栧鍏ユā鏉跨殑鍒楀悕
+	 * @param flag 鏄惁鑾峰彇瀵煎叆妯℃澘鍒楀悕
+	 * @return
+	 */
+	private List<String> getCloumns(boolean flag){
+		if(flag){
+			return new ArrayList<>(
+					Arrays.asList("灞炴�у悕", "鏍囩", "鎻忚堪",
+							"灞炴�х被鍨�(鍙傜収鏂板鐣岄潰鐨勫睘鎬х被鍨嬪VTString)", "鍏佽涓虹┖(鏄�/鍚�)", "榛樿鍊�", "浣跨敤鐨勬灇涓捐嫳鏂囧悕绉�"
+							, "鍙傜収鐨勪笟鍔＄被鍨嬬紪鍙�","鍙傜収鐨勯摼鎺ョ被鍨嬬紪鍙�","鐗堟湰鐗堟","灞炴�ч暱搴�", "灏忔暟绮惧害浣嶆暟","灏忔暟鍒诲害浣嶆暟"
+							,"鍙栧�艰寖鍥�"
+					)
+			);
+		}
+		return new ArrayList<>(
+				Arrays.asList("灞炴�у悕", "鏍囩", "鎻忚堪",
+						"灞炴�х被鍨�", "鍏佽涓虹┖", "榛樿鍊�", "浣跨敤鐨勬灇涓捐嫳鏂囧悕绉�(鏋氫妇鍚�)",
+						"鍙傜収鐨勪笟鍔＄被鍨嬬紪鍙�", "鍙傜収鐨勯摼鎺ョ被鍨嬬紪鍙�","鐗堟湰鐗堟","灞炴�ч暱搴�",
+						"灏忔暟绮惧害浣嶆暟","灏忔暟鍒诲害浣嶆暟","鍙栧�艰寖鍥�","鍒涘缓鏃堕棿")
+		);
 	}
 
 	/**
@@ -941,11 +963,7 @@
 		//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
 		exportFileName = Func.isBlank(exportFileName) ?  "灞炴�ф睜瀵煎叆妯℃澘_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
 		//璁剧疆鍒楀悕
-		List<String> columns = new ArrayList<>(
-				Arrays.asList("灞炴�у悕", "鏍囩", "鎻忚堪",
-						"灞炴�х被鍨�(璇峰弬鐓ф柊澧炵晫闈㈢殑灞炴�х被鍨嬪～鍐�)", "鍏佽涓虹┖(鏄�/鍚�)", "榛樿鍊�", "浣跨敤鐨勬灇涓捐嫳鏂囧悕绉�", "鍙傜収鐨勪笟鍔＄被鍨嬬紪鍙�",
-						"鍙傜収鐨勯摼鎺ョ被鍨嬬紪鍙�","鐗堟湰鐗堟","灞炴�ч暱搴�", "灏忔暟绮惧害浣嶆暟","灏忔暟鍒诲害浣嶆暟","鍙栧�艰寖鍥�")
-		);
+		List<String> columns = this.getCloumns(true);
 		//璁剧疆蹇呭～鍒�
 		ColumnNameisRed.clear();
 		ColumnNameisRed.add(0);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index 1a59db5..50292b7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -385,14 +385,14 @@
 	 * @return
 	 */
 	@Override
-	public String exportEnumTypes(String exportFileName,String enumNames) throws PLException {
+	public String exportEnumTypes(String exportFileName,String enumNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException {
 		if(Func.isBlank(enumNames)){
 			throw new PLException("500",new String[]{"璇峰嬀閫夎瀵煎嚭鐨勬灇涓�!"});
 		}
 		//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
 		exportFileName = Func.isBlank(exportFileName) ?  "鏋氫妇绫诲瀷瀵煎嚭_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
 		//璁剧疆鍒楀悕
-		List<String> columns = new ArrayList<>(Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害","鍒涘缓鏃堕棿", "鏋氫妇椤瑰悕绉�", "鏋氫妇鍊�", "鎻忚堪"));
+		List<String> columns = this.getCloumns(flag);
 
 		//鍐檈xcel
 		String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
@@ -418,39 +418,54 @@
 			if(Func.isEmpty(osEnumVO) && Func.isBlank(osEnumVO.getOid())){
 				throw new PLException("500",new String[]{"鏈煡璇㈠埌鏋氫妇鍚嶄负銆�" + enumNameList.get(i) + "銆戠殑鏋氫妇锛岃鍒锋柊鍚庨噸鏂板鍑�!"});
 			}
-			//鏋氫妇椤逛笉涓虹┖鏃堕渶瑕佽�冭檻鍚堝苟琛岄棶棰�
+			//鎸夌収瀵煎嚭鍒楀悕鎺у埗鍙橀噺鍜屾灇涓鹃」涓嶄负绌烘椂鍐冲畾鏄惁闇�瑕佽�冭檻鍚堝苟琛岄棶棰�
 			List<OsEnumItemVO> enumVOItems = osEnumVO.getItems();
-			//鏋氫妇椤逛笉涓虹┖鏃堕渶瑕佽繘琛屽悎骞惰澶勭悊
-			if(Func.isNotEmpty(enumVOItems) || enumVOItems.size() > 1){
-				//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getOid()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getId()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,1, osEnumVO.getName()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,2, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,3, osEnumVO.getLength()));
-				//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,5, osEnumVO.getCreator()));
-				excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,4, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
-
-				//澶勭悊鏋氫妇椤瑰啓鍏�
+			//鍒ゆ柇鏄寜鐓т粈涔堝垪鍚嶅鍑�
+			if(flag){
 				for (int j = 0; j < enumVOItems.size(); j++) {
 					OsEnumItemVO osEnumItemVO = enumVOItems.get(j);
-					excelDataList.add(new WriteExcelData(startRow+j,5, true,osEnumItemVO.getName()));
-					excelDataList.add(new WriteExcelData(startRow+j,6, true, osEnumItemVO.getValue()));
-					excelDataList.add(new WriteExcelData(startRow+j,7, true, osEnumItemVO.getDescription()));
-				}
+					excelDataList.add(new WriteExcelData(i+j+1,0, osEnumVO.getId()));
+					excelDataList.add(new WriteExcelData(i+j+1,1, osEnumVO.getName()));
+					excelDataList.add(new WriteExcelData(i+j+1,2, osEnumVO.getEnumValueDataType()));
+					excelDataList.add(new WriteExcelData(i+j+1,3, osEnumVO.getLength()));
 
-				startRow += enumVOItems.size();
+					excelDataList.add(new WriteExcelData(i+j+1,4,osEnumItemVO.getName()));
+					excelDataList.add(new WriteExcelData(i+j+1,5, osEnumItemVO.getValue()));
+					excelDataList.add(new WriteExcelData(i+j+1,6, osEnumItemVO.getDescription()));
+				}
 			}else{
-				//鏋氫妇椤逛负绌烘椂灏变笉闇�瑕佸悎骞惰
-				//excelDataList.add(new WriteExcelData(startRow,0, true,osEnumVO.getOid()));
-				excelDataList.add(new WriteExcelData(startRow,0, true, osEnumVO.getId()));
-				excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getName()));
-				excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
-				excelDataList.add(new WriteExcelData(startRow,3, true, osEnumVO.getLength()));
-				//excelDataList.add(new WriteExcelData(startRow,5, true, osEnumVO.getCreator()));
-				excelDataList.add(new WriteExcelData(startRow,4, true, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
+				//鏋氫妇椤逛笉涓虹┖鏃堕渶瑕佽繘琛屽悎骞惰澶勭悊
+				if(Func.isNotEmpty(enumVOItems) || enumVOItems.size() > 1){
+					//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getOid()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,0, osEnumVO.getId()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,1, osEnumVO.getName()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,2, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,3, osEnumVO.getLength()));
+					//excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,5, osEnumVO.getCreator()));
+					excelDataList.add(new WriteExcelData(startRow,(enumVOItems.size()+startRow)-1,true,true,4, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
+
+					//澶勭悊鏋氫妇椤瑰啓鍏�
+					for (int j = 0; j < enumVOItems.size(); j++) {
+						OsEnumItemVO osEnumItemVO = enumVOItems.get(j);
+						excelDataList.add(new WriteExcelData(startRow+j,5, true,osEnumItemVO.getName()));
+						excelDataList.add(new WriteExcelData(startRow+j,6, true, osEnumItemVO.getValue()));
+						excelDataList.add(new WriteExcelData(startRow+j,7, true, osEnumItemVO.getDescription()));
+					}
+
+					startRow += enumVOItems.size();
+				}else{
+					//鏋氫妇椤逛负绌烘椂灏变笉闇�瑕佸悎骞惰
+					//excelDataList.add(new WriteExcelData(startRow,0, true,osEnumVO.getOid()));
+					excelDataList.add(new WriteExcelData(startRow,0, true, osEnumVO.getId()));
+					excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getName()));
+					excelDataList.add(new WriteExcelData(startRow,1, true, osEnumVO.getEnumValueDataType()+"("+osEnumVO.getEnumValueDataTypeText()+")"));
+					excelDataList.add(new WriteExcelData(startRow,3, true, osEnumVO.getLength()));
+					//excelDataList.add(new WriteExcelData(startRow,5, true, osEnumVO.getCreator()));
+					excelDataList.add(new WriteExcelData(startRow,4, true, Func.format(osEnumVO.getCreateTime(),"yyyy骞碝M鏈坉d鏃� hh:mm:ss")));
+				}
+				//璁板綍涓嬩笂涓�缁勬暟鎹粨鏉熸椂鐨勮鍙凤紝鏂逛究鐢ㄥ仛鍚堝苟琛岀殑璧峰琛�
+				startRow += 1;
 			}
-			//璁板綍涓嬩笂涓�缁勬暟鎹粨鏉熸椂鐨勮鍙凤紝鏂逛究鐢ㄥ仛鍚堝苟琛岀殑璧峰琛�
-			startRow += 1;
 		}
 		WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
 		ExcelUtil.writeDataToFile(excelPath, excelOption);
@@ -467,7 +482,7 @@
 		//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
 		exportFileName = Func.isBlank(exportFileName) ?  "鏋氫妇瀵煎叆妯℃澘_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
 		//璁剧疆鍒楀悕
-		List<String> columns = new ArrayList<>(Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害", "鏋氫妇椤瑰悕绉�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭～)", "鏋氫妇鍊�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭～)", "鎻忚堪","*娉ㄦ剰*:绗簩琛屽紑濮嬬殑鏁版嵁涓虹ず渚嬫暟鎹紝瀵煎叆鍓嶈灏嗗叾鍒犻櫎锛屽綋瀵煎叆鐨勬灇涓句笅鍏峰澶氫釜鏋氫妇椤规椂锛屽簲鎸夌収绀轰緥enum2鐨勫啓娉�"));
+		List<String> columns = this.getCloumns(true);
 		//鍐檈xcel
 		String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
 		//璁剧疆蹇呭～鍒�
@@ -514,6 +529,27 @@
 		WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
 		ExcelUtil.writeDataToFile(excelPath, excelOption);
 		return excelPath;
+	}
+
+	/**
+	 * 鑾峰彇瀵煎嚭鎴栧鍏ユā鏉跨殑鍒楀悕
+	 * @param flag 鏄惁鑾峰彇瀵煎叆妯℃澘鍒楀悕
+	 * @return
+	 */
+	private List<String> getCloumns(boolean flag){
+		if(flag){
+			return new ArrayList<>(
+				Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害", "鏋氫妇椤瑰悕绉�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭～)",
+						"鏋氫妇鍊�(褰撳墠鏋氫妇涓嬫湁鏋氫妇椤规椂蹇呭～)", "鎻忚堪","*娉ㄦ剰*:绗簩琛屽紑濮嬬殑鏁版嵁涓虹ず渚嬫暟鎹紝瀵煎叆鍓嶈灏嗗叾鍒犻櫎锛�" +
+								"褰撳鍏ョ殑鏋氫妇涓嬪叿澶囧涓灇涓鹃」鏃讹紝搴旀寜鐓хず渚媏numb鐨勫啓娉�"
+				)
+			);
+		}
+		return new ArrayList<>(
+			Arrays.asList("鏋氫妇鍚嶇О", "鏍囩", "杩斿洖绫诲瀷", "闀垮害",
+				"鍒涘缓鏃堕棿", "鏋氫妇椤瑰悕绉�", "鏋氫妇鍊�", "鎻忚堪"
+			)
+		);
 	}
 
 	/**
@@ -619,7 +655,7 @@
 	 * @return
 	 */
 	private List<OsEnumVO> getExportEnumTempExample(){
-		String testJosn = "[{\"enumValueDataType\":\"String\",\"id\":\"enum1\",\"items\":[{\"description\":\"enumitem1.1\",\"name\":\"enumitem1.1\",\"value\":\"1\"},{\"description\":\"enumitem1.2\",\"name\":\"enumitem1.2\",\"value\":\"2\"}],\"length\":2,\"name\":\"enum1\"},{\"enumValueDataType\":\"String\",\"id\":\"enum2\",\"items\":[{\"description\":\"enumitem2.1\",\"name\":\"enumitem2.1\",\"value\":\"1\"},{\"description\":\"enumitem2.2\",\"name\":\"enumitem2.2\",\"value\":\"2\"},{\"description\":\"enumitem2.3\",\"name\":\"enumitem2.3\",\"value\":\"3\"}],\"length\":6,\"name\":\"enum2\"}]";
+		String testJosn = "[{\"enumValueDataType\":\"String\",\"id\":\"enuma\",\"items\":[{\"description\":\"enumitem1.1\",\"name\":\"enumitem1.1\",\"value\":\"1\"},{\"description\":\"enumitem1.2\",\"name\":\"enumitem1.2\",\"value\":\"2\"}],\"length\":2,\"name\":\"enuma\"},{\"enumValueDataType\":\"String\",\"id\":\"enumb\",\"items\":[{\"description\":\"enumitem2.1\",\"name\":\"enumitem2.1\",\"value\":\"1\"},{\"description\":\"enumitem2.2\",\"name\":\"enumitem2.2\",\"value\":\"2\"},{\"description\":\"enumitem2.3\",\"name\":\"enumitem2.3\",\"value\":\"3\"}],\"length\":6,\"name\":\"enumb\"}]";
 		List<OsEnumVO> OsEnumVOs = JSON.parseArray(testJosn,OsEnumVO.class);
 		return OsEnumVOs;
 	}
@@ -952,7 +988,12 @@
 			for(int k = 0; k < emChildren.length; k++){
 				EnumItem emChild = emChildren[k];
 				String value = emChild.value;
-				valueList.add(value);
+				String symbol = "";
+				//褰撲负Integer鏃堕渶瑕佸皢鏋氫妇椤瑰�兼嫾鎺ヤ笂=
+				if("Integer".equals(enumType)){
+					symbol = "=";
+				}
+				valueList.add(symbol + value);
 			}
 			Map<String, List<String>> enumMap = new HashMap<>();
 			enumMap.put(emItem.name, valueList);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
index 4adf929..7a59184 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
@@ -1,11 +1,14 @@
 package com.vci.web.service.impl;
 
+import com.vci.client.mw.ClientSessionUtility;
 import com.vci.corba.common.PLException;
 import com.vci.corba.omd.vrm.VersionRule;
+import com.vci.dto.OsRevisionRuleDTO;
 import com.vci.starter.web.annotation.log.VciUnLog;
 import com.vci.starter.web.util.VciDateUtil;
 import com.vci.pagemodel.OsRevisionRuleVO;
 import com.vci.web.service.OsRevisionRuleServiceI;
+import com.vci.web.util.Func;
 import com.vci.web.util.PlatformClientUtil;
 import com.vci.web.util.WebUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -13,6 +16,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import javax.swing.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -36,6 +40,7 @@
     @Autowired(required = false)
     @Lazy
     private OsRevisionRuleServiceI self;
+
     /**
      * 鏌ヨ鎵�鏈夌殑鐗堟湰瑙勫垯
      *
@@ -59,6 +64,49 @@
     @VciUnLog
     public Map<String, OsRevisionRuleVO> selectAllRevisionMap() {
         return Optional.ofNullable(self.selectAllRevision()).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getId().toLowerCase(),t->t,(o1,o2)->o1));
+    }
+
+    /**
+     * 鍒涘缓鐗堟湰瑙勫垯
+     * @param osRevisionRuleDTO
+     * @return
+     */
+    @Override
+    public boolean addVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) throws PLException {
+        VersionRule vr = platformClientUtil.getVersionService().getVersionRule(osRevisionRuleDTO.getName());
+        //name涓嶄负绌�
+        if(Func.isNotEmpty(vr) && !"".equals(vr.name)){
+            throw new PLException("500",new String[]{"鍚嶇О閲嶅璇锋洿鎹㈠悕绉�!"});
+        }
+
+        platformClientUtil.getVersionService().addVersionRule(this.dto2VersionRule(osRevisionRuleDTO));
+        return false;
+    }
+
+    @Override
+    public boolean updateVersionRule(OsRevisionRuleDTO osRevisionRuleDTO) {
+
+        return false;
+    }
+
+    /**
+     * dto瀵硅薄杞崲涓篤ersionRule瀵硅薄
+     * @return
+     */
+    private VersionRule dto2VersionRule(OsRevisionRuleDTO osRevisionRuleDTO){
+        VersionRule newVR = new VersionRule();
+        newVR.name = osRevisionRuleDTO.getId();
+        newVR.tag = osRevisionRuleDTO.getName();
+        newVR.jumpCharacter = osRevisionRuleDTO.getPrefixCode();
+        /*newVR.initialValue = jtf3.getText();
+        newVR.stepLength = jtf4.getText();
+        newVR.prefixion = jtf5.getText();
+        newVR.suffix = jtf6.getText();
+        newVR.description = jta.getText();*/
+        String userName = ClientSessionUtility.getCurUserName();
+        newVR.creator = userName;
+        newVR.modifier = userName;
+        return newVR;
     }
 
     /**
@@ -125,10 +173,35 @@
     }
 
     /**
+     * 鏌ヨ搴旂敤鑼冨洿
+     * @param vrName 鐗堟湰瑙勫垯鑻辨枃鍚嶇О
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> getUsedVersionRuleList(String vrName) throws PLException {
+        if(Func.isBlank(vrName)){
+            throw new PLException("500",new String[]{"璇烽�夋嫨瑕佹煡璇㈠簲鐢ㄨ寖鍥寸殑灞炴��!"});
+        }
+        String[] btNames = platformClientUtil.getBtmService().getBTNamesByVerName(vrName);
+        if(Func.isEmpty(btNames)){
+            return new ArrayList<>();
+        }
+        List<Map<String,String>> btmNameMapList = new ArrayList<>();
+        Arrays.stream(btNames).forEach(btName->{
+            Map<String, String> itemMap = new HashMap<>();
+            itemMap.put("versionRuleName",vrName);
+            itemMap.put("source",btName);
+            btmNameMapList.add(itemMap);
+        });
+        return btmNameMapList;
+    }
+
+    /**
      * 娓呴櫎缂撳瓨
      */
     @Override
     public void clearCache() {
 
     }
+
 }
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 033c3f4..f8abe1d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -404,14 +404,14 @@
      * @return
      */
     @Override
-    public String exportStatus(String exportFileName, String statusOids) throws PLException {
+    public String exportStatus(String exportFileName, String statusOids,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException {
         if(Func.isBlank(statusOids)){
             throw new PLException("500",new String[]{"璇峰嬀閫夎瀵煎嚭鐨勫睘鎬�!"});
         }
         //鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
         exportFileName = Func.isBlank(exportFileName) ?  "鐘舵�佹睜鐘舵�佸鍑篲" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
         //璁剧疆鍒楀悕
-        List<String> columns = new ArrayList<>(Arrays.asList("鍚嶇О", "鏍囩", "鍥剧墖", "鎻忚堪"));
+        List<String> columns = this.getCloumns(flag);
 
         //鍐檈xcel
         String excelPath = LocalFileUtil.getDefaultTempFolder() + File.separator + exportFileName +  ".xls";
@@ -453,9 +453,7 @@
         //鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
         exportFileName = Func.isBlank(exportFileName) ?  "鐘舵�佹睜瀵煎叆妯℃澘_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss"):exportFileName;
         //璁剧疆鍒楀悕
-        List<String> columns = new ArrayList<>(
-                Arrays.asList("鍚嶇О(涓嶈兘涓虹┖)", "鏍囩(瀵瑰悕绉扮殑瑙ｉ噴)","鍥剧墖(璺緞)", "鎻忚堪(鍙互涓虹┖)")
-        );
+        List<String> columns = this.getCloumns(true);
         //璁剧疆蹇呭～鍒�
         ColumnNameisRed.clear();
         ColumnNameisRed.add(0);
@@ -486,6 +484,20 @@
     }
 
     /**
+     * 鑾峰彇瀵煎嚭鎴栧鍏ユā鏉跨殑鍒楀悕
+     * @param flag 鏄惁鑾峰彇瀵煎叆妯℃澘鍒楀悕
+     * @return
+     */
+    private List<String> getCloumns(boolean flag){
+        if(flag){
+            return new ArrayList<>(
+                    Arrays.asList("鍚嶇О(涓嶈兘涓虹┖)", "鏍囩(瀵瑰悕绉扮殑瑙ｉ噴)","鍥剧墖(璺緞)", "鎻忚堪(鍙互涓虹┖)")
+            );
+        }
+        return new ArrayList<>(Arrays.asList("鍚嶇О", "鏍囩", "鍥剧墖", "鎻忚堪"));
+    }
+
+    /**
      * 瀵煎叆鐘舵��
      * @param file
      * @return

--
Gitblit v1.9.3