From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 15 一月 2025 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
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 be7701a..cb2d73f 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
@@ -2,6 +2,9 @@
import com.vci.corba.common.PLException;
import com.vci.corba.omd.stm.StatePool;
+import com.vci.dto.OsStatusDTO;
+import com.vci.model.OsStatusDO;
+import com.vci.pagemodel.OsStatusVO;
import com.vci.po.OsStatusPO;
import com.vci.starter.poi.bo.ReadExcelOption;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -15,13 +18,10 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.*;
-import com.vci.dto.OsStatusDTO;
-import com.vci.model.OsStatusDO;
-import com.vci.pagemodel.OsStatusVO;
+import com.vci.starter.web.util.Lcm.Func;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -108,7 +108,7 @@
}
statusVO.setDescription(statePool.description);
statusVO.setId(statePool.name);
- statusVO.setName(statePool.tag);
+ statusVO.setName(statePool.label);
}
return statusVO;
}
@@ -388,7 +388,7 @@
statePool.modifier = userId;
statePool.modifyTime = now;
statePool.ts = statusDTO.getTs()==null?VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat):VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
- statePool.tag = statusDTO.getName();
+ statePool.label = statusDTO.getName();
return statePool;
}
@@ -575,7 +575,7 @@
statePool.modifier = statusVO.getLastModifier();
statePool.modifyTime = VciDateUtil.getTime(statusVO.getLastModifyTime());
statePool.ts = statusVO.getTs()==null?now:VciDateUtil.date2Str(statusVO.getTs(),VciDateUtil.DateTimeMillFormat);
- statePool.tag = statusVO.getName();
+ statePool.label = statusVO.getName();
return statePool;
}
--
Gitblit v1.9.3