From d5ffec728c333461b466ba5761616f90076117e5 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 19 四月 2024 17:57:04 +0800
Subject: [PATCH] 1、主要完成对一些基础类的替换，将以前老的bean对象换成新平台的bean对象。 2、对树的查询接口进行修改测试联调。 3、对列表数据的查询接口进行修改测试联调。 4、对通用保存接口进行编写测试。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/pageModel/BatchCBO.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/pageModel/BatchCBO.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/pageModel/BatchCBO.java
index 7f49588..a43d086 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/pageModel/BatchCBO.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/pageModel/BatchCBO.java
@@ -1,9 +1,8 @@
package com.vci.web.pageModel;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.client.bof.ClientLinkObject;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
@@ -121,14 +120,14 @@
if( this.createCbos == null){
this.createCbos = new HashSet<ClientBusinessObject>();
}
- return this.createCbos.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCboArray);
+ return this.createCbos.stream().sorted(((o1, o2) -> Math.toIntExact(o1.getCreateTime() - o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCboArray);
}
public ClientLinkObject[] getCreateCloArray(){
if( this.createClos == null){
this.createClos = new HashSet<ClientLinkObject>();
}
- return this.createClos.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCloArray);
+ return this.createClos.stream().sorted(((o1, o2) -> Math.toIntExact(o1.getCreateTime() - o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCloArray);
}
@@ -136,14 +135,14 @@
if( this.updateCbos == null){
this.updateCbos = new HashSet<ClientBusinessObject>();
}
- return this.updateCbos.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCboArray);
+ return this.updateCbos.stream().sorted(((o1, o2) -> Math.toIntExact(o1.getCreateTime() - o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCboArray);
}
public ClientLinkObject[] getUpdateCloArray(){
if( this.updateClos == null){
this.updateClos = new HashSet<ClientLinkObject>();
}
- return this.updateClos.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCloArray);
+ return this.updateClos.stream().sorted(((o1, o2) -> Math.toIntExact(o1.getCreateTime() - o2.getCreateTime()))).collect(Collectors.toList()).toArray(nullCloArray);
}
public ClientBusinessObject[] getDeleteCboArray(){
--
Gitblit v1.9.3