Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java

@@ -1,11 +1,8 @@
package com.vci.ubcs.code.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 org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

@@ -32,14 +29,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 +46,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;