|
@@ -57,6 +57,7 @@ import org.slf4j.LoggerFactory
|
|
|
import org.springframework.stereotype.Service
|
|
|
import java.text.SimpleDateFormat
|
|
|
import java.util.*
|
|
|
+import kotlin.collections.HashSet
|
|
|
|
|
|
/**
|
|
|
* 手动计算
|
|
@@ -4158,14 +4159,14 @@ open class ManualRelationCalcService {
|
|
|
val rSp2SpTwoList = CommonServices.rSh2BdTwoService.select(listSF).exec()
|
|
|
if (rSp2SpTwoList.size>0) {
|
|
|
|
|
|
- val listId1 = ArrayList<String>()
|
|
|
- val listId2 = ArrayList<String>()
|
|
|
+ val listId1 = HashSet<String>()
|
|
|
+ val listId2 = HashSet<String>()
|
|
|
for (rSp2SpTwo in rSp2SpTwoList){
|
|
|
listId1.add(rSp2SpTwo.id1!!)
|
|
|
listId2.add(rSp2SpTwo.id2!!)
|
|
|
}
|
|
|
val sCascadeQuery = sQueryRequest.cascade!!.get(0)
|
|
|
- sCascadeQuery.filters = "projectId = '$projectId';id in ${listId2.toJson()}"
|
|
|
+ sCascadeQuery.filters = "projectId = '$projectId';id in ${listId2.toList().toJson()}"
|
|
|
list.add(SFilter.inList("id",listId1.toList()))
|
|
|
val pageQuery = CommonServices.relShaftForBdService.pageQuery(sQueryRequest, list)
|
|
|
manualRelationCalcResponse.direction = "Left"
|