From db1c3c5b3670639fd1dfc5de0fe75ce6f02f732e Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 31 五月 2023 14:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java
similarity index 65%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java
index 4db0b71..0aa56b7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java
@@ -1,10 +1,8 @@
-package com.vci.ubcs.code.wrapper;
+package com.vci.ubcs.code.webservice.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreAttrMapping;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -12,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+
/**
*闆嗗洟缂栫爜闆嗘垚灞炴�ф槧灏勯厤缃寘瑁呯被
*
@@ -31,14 +30,15 @@
/***
* 鏁扮粍瀵硅薄杞崲
- * @param dockingPreAttrMappings
+ * @param entitys
* @return
*/
- public List<DockingPreAttrMappingVO> entityVOs(Collection<DockingPreAttrMapping> dockingPreAttrMappings) {
+ public List<DockingPreAttrMappingVO> entityVOs(Collection<DockingPreAttrMapping> entitys) {
+ if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingPreAttrMappings)) {
- dockingPreAttrMappings.stream().forEach(dockingPreAttrMapping -> {
- dockingPreAttrMappingVOList.add(entityVO(dockingPreAttrMapping));
+ if(!CollectionUtils.isEmpty(entitys)) {
+ entitys.stream().forEach(entity -> {
+ dockingPreAttrMappingVOList.add(entityVO(entity));
});
}
return dockingPreAttrMappingVOList;
@@ -46,14 +46,15 @@
/***
* 鏁扮粍瀵硅薄杞崲
- * @param dockingPreAttrMappingVOS
+ * @param vos
* @return
*/
- public List<DockingPreAttrMapping> voentitys(Collection<DockingPreAttrMappingVO> dockingPreAttrMappingVOS) {
+ public List<DockingPreAttrMapping> voentitys(Collection<DockingPreAttrMappingVO> vos) {
+ if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
List<DockingPreAttrMapping> dockingPreAttrMappingList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingPreAttrMappingVOS)) {
- dockingPreAttrMappingVOS.stream().forEach(dockingPreAttrMappingVO -> {
- dockingPreAttrMappingList.add(voentity(dockingPreAttrMappingVO));
+ if(!CollectionUtils.isEmpty(vos)) {
+ vos.stream().forEach(vo -> {
+ dockingPreAttrMappingList.add(voentity(vo));
});
}
return dockingPreAttrMappingList;
--
Gitblit v1.9.3