|
@@ -547,7 +547,12 @@ open class ManualRelationCalcService {
|
|
|
for (spbuilding in spbuildingIdVagueToZoneType) {
|
|
|
listBuildingId.add(spbuilding.id!!)
|
|
|
}
|
|
|
- val rBd2SpBuilidingList = rBd2SpBuilidingService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("id", listBuildingId)).exec()
|
|
|
+ var rBd2SpBuilidingList: ArrayList<RBd2SpBuiliding>
|
|
|
+ if(spbuildingIdVagueToZoneType.size > 0){
|
|
|
+ rBd2SpBuilidingList = rBd2SpBuilidingService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("id", listBuildingId)).exec()
|
|
|
+ }else{
|
|
|
+ rBd2SpBuilidingList = rBd2SpBuilidingService.select(SFilter.eq("projectId", Opt.projectId!!)).exec()
|
|
|
+ }
|
|
|
for (spbuilding in rBd2SpBuilidingList) {
|
|
|
for (spaceBase in spaceBaseList) {
|
|
|
if (spaceBase.buildingId == spbuilding.id) {
|
|
@@ -962,6 +967,11 @@ open class ManualRelationCalcService {
|
|
|
list.add(SFilter.eq("projectId",Opt.projectId!!))
|
|
|
|
|
|
val rEq2SyList = rEq2SyService.select(SFilter.eq("projectId", Opt.projectId!!)).exec()
|
|
|
+ val syIds = LinkedHashSet<String>()
|
|
|
+ for (rEq2Sy in rEq2SyList) {
|
|
|
+ syIds.add(rEq2Sy.id1!!)
|
|
|
+ }
|
|
|
+
|
|
|
if (rEq2SyList.size>0) {
|
|
|
if (manualRelationCalcRequest.objectType == "1") {
|
|
|
if (!manualRelationCalcRequest.vagueFrom.isNullOrEmpty()) {
|
|
@@ -970,8 +980,12 @@ open class ManualRelationCalcService {
|
|
|
if (!manualRelationCalcRequest.categoryFrom.isNullOrEmpty()) {
|
|
|
list.add(SFilter.eq("classCode",manualRelationCalcRequest.categoryFrom!!))
|
|
|
}
|
|
|
+ if(syIds.size > 0){
|
|
|
+ list.add(SFilter.inList("id",ArrayList(syIds)))
|
|
|
+ }
|
|
|
+// list.add(SFilter.not(SFilter.isNull("objectInfo")))
|
|
|
val pageQuery = relSy2EqSystemService.pageQuery(sQueryRequest, list)
|
|
|
- manualRelationCalcResponse.content = pageQuery.content
|
|
|
+ manualRelationCalcResponse.content = pageQuery.content!!.filter { r -> r.objectInfo != null }
|
|
|
manualRelationCalcResponse.message = pageQuery.message
|
|
|
manualRelationCalcResponse.pageNumber = pageQuery.pageNumber
|
|
|
manualRelationCalcResponse.pageSize = pageQuery.pageSize
|