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-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
index 180de6b..6379d4e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavServiceImpl.java
@@ -1,5 +1,11 @@
package com.vci.web.service.impl;
+import com.vci.dto.WFWorkflowNodeFavDTO;
+import com.vci.model.WFWorkflowNodeFavDO;
+import com.vci.model.WFWorkflowNodeFavItemDO;
+import com.vci.pagemodel.BatchCBO;
+import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
+import com.vci.pagemodel.WFWorkflowNodeFavVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
@@ -7,17 +13,11 @@
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.WFWorkflowNodeFavDaoI;
import com.vci.web.dao.WFWorkflowNodeFavItemDaoI;
-import com.vci.dto.WFWorkflowNodeFavDTO;
-import com.vci.model.WFWorkflowNodeFavDO;
-import com.vci.model.WFWorkflowNodeFavItemDO;
-import com.vci.pagemodel.BatchCBO;
-import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
-import com.vci.pagemodel.WFWorkflowNodeFavVO;
import com.vci.web.service.WFWorkflowNodeFavItemServiceI;
import com.vci.web.service.WFWorkflowNodeFavServiceI;
import org.apache.commons.lang3.StringUtils;
@@ -127,7 +127,7 @@
public WFWorkflowNodeFavVO wFWorkflowNodeFavDO2VO(WFWorkflowNodeFavDO wFWorkflowNodeFavDO) throws VciBaseException{
WFWorkflowNodeFavVO vo = new WFWorkflowNodeFavVO();
if(wFWorkflowNodeFavDO != null){
- BeanUtil.convert(wFWorkflowNodeFavDO,vo);
+ BeanUtilForVCI.convert(wFWorkflowNodeFavDO,vo);
//杩橀渶瑕佸鐞嗘灇涓剧瓑鍏朵粬鐨勫唴瀹�
}
return vo;
@@ -161,7 +161,7 @@
}else{
//灏咲TO杞崲涓篋O
WFWorkflowNodeFavDO wFWorkflowNodeFavDO = new WFWorkflowNodeFavDO();
- BeanUtil.convert(wFWorkflowNodeFavDTO,wFWorkflowNodeFavDO);
+ BeanUtilForVCI.convert(wFWorkflowNodeFavDTO,wFWorkflowNodeFavDO);
wFWorkflowNodeFavDO.setUserId(userId);
revisionModelUtil.wrapperForAdd(wFWorkflowNodeFavDO);
wFWorkflowNodeFavMapper.insert(wFWorkflowNodeFavDO);
@@ -170,7 +170,7 @@
String schemaOid = favDO.getOid();
wFWorkflowNodeFavDTO.getItems().stream().forEach(item->{
WFWorkflowNodeFavItemDO itemDO = new WFWorkflowNodeFavItemDO();
- BeanUtil.convert(item,itemDO);
+ BeanUtilForVCI.convert(item,itemDO);
itemDO.setWorkflowNodeFavOid(schemaOid);
newItems.add(itemDO);
});
@@ -211,7 +211,7 @@
List<WFWorkflowNodeFavItemDO> newItems = new ArrayList<>();
wFWorkflowNodeFavDTO.getItems().stream().forEach(item -> {
WFWorkflowNodeFavItemDO itemDO = new WFWorkflowNodeFavItemDO();
- BeanUtil.convert(item, itemDO);
+ BeanUtilForVCI.convert(item, itemDO);
itemDO.setWorkflowNodeFavOid(wFWorkflowNodeFavDO.getOid());
newItems.add(itemDO);
});
--
Gitblit v1.9.3