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/DockingPreAttrRangeWrapper.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrRangeWrapper.java
similarity index 64%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrRangeWrapper.java
index 0df3141..3b169cc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrRangeWrapper.java
@@ -1,11 +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.vo.pagemodel.DockingPreClassifyVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrRange;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -13,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+
/**
*闆嗗洟缂栫爜鍒嗙被妯″瀷瑙嗗浘灞炴�у彇鍊艰寖鍥村寘瑁呯被
*
@@ -32,14 +30,16 @@
/***
* 鏁扮粍瀵硅薄杞崲
- * @param dockingPreAttrRanges
+ * @param entitys
* @return
*/
- public List<DockingPreAttrRangeVO> entityVOs(Collection<DockingPreAttrRange> dockingPreAttrRanges) {
+ public List<DockingPreAttrRangeVO> entityVOs(Collection<DockingPreAttrRange> entitys) {
+ if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingPreAttrRanges)) {
- dockingPreAttrRanges.stream().forEach(dockingPreAttrRange -> {
- dockingPreAttrRangeVOList.add(entityVO(dockingPreAttrRange));
+
+ if(!CollectionUtils.isEmpty(entitys)) {
+ entitys.stream().forEach(entity -> {
+ dockingPreAttrRangeVOList.add(entityVO(entity));
});
}
return dockingPreAttrRangeVOList;
@@ -47,14 +47,15 @@
/***
* 鏁扮粍瀵硅薄杞崲
- * @param dockingPreAttrRangeVos
+ * @param vos
* @return
*/
- public List<DockingPreAttrRange> voentitys(Collection<DockingPreAttrRangeVO> dockingPreAttrRangeVos) {
+ public List<DockingPreAttrRange> voentitys(Collection<DockingPreAttrRangeVO> vos) {
+ if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
List<DockingPreAttrRange> dockingPreAttrRangeList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingPreAttrRangeVos)) {
- dockingPreAttrRangeVos.stream().forEach(dockingPreAttrRangeVO -> {
- dockingPreAttrRangeList.add(voentity(dockingPreAttrRangeVO));
+ if(!CollectionUtils.isEmpty(vos)) {
+ vos.stream().forEach(vo -> {
+ dockingPreAttrRangeList.add(voentity(vo));
});
}
return dockingPreAttrRangeList;
--
Gitblit v1.9.3