From 16a9df03e3c98dab2fcc1d888675c7a774478970 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 15 十月 2024 14:47:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
index d2a3640..cc29913 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
@@ -1,11 +1,12 @@
package com.vci.web.dao.impl;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.dao.OsCodeRuleDaoI;
-import com.vci.web.model.OsCodeRuleDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.OsCodeRuleDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
@@ -18,7 +19,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
@@ -163,7 +164,7 @@
*/
@Override
public long batchUpdateLcStatus(Collection<String> oids, String lcStatus) {
- List<com.vci.client.bof.ClientBusinessObject> cbos = boService.selectCBOByOidCollection(oids, "oscoderule");
+ List<BusinessObject> cbos = boService.selectCBOByOidCollection(oids, "oscoderule");
if(CollectionUtils.isEmpty(cbos)){
return 0;
}
@@ -179,11 +180,11 @@
*/
@Override
public int updateLcStatus(String oid, String lcStatus) {
- com.vci.client.bof.ClientBusinessObject cbo = boService.selectCBOByOid(oid, "oscoderule");
- if(cbo == null || StringUtils.isBlank(cbo.getOid())){
+ BusinessObject cbo = boService.selectCBOByOid(oid, "oscoderule");
+ if(cbo == null || StringUtils.isBlank(cbo.oid)){
return 0;
}
- lifeCycleService.transStatus(cbo.getBusinessObject(),lcStatus);
+ lifeCycleService.transStatus(cbo,lcStatus);
return 1;
}
--
Gitblit v1.9.3