|
@@ -137,16 +137,18 @@ object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::c
|
|
|
fun spaceQuery(request: PlanarEquipRequests): SQueryResponse<PlanarSpace> {
|
|
|
try {
|
|
|
val sQueryResponse = SQueryResponse<PlanarSpace>(SResponseType.success)
|
|
|
- if (request.spaceIds.isNullOrEmpty()){
|
|
|
- request.spaceIds = ArrayList()
|
|
|
- }
|
|
|
+
|
|
|
if (!request.zoneTypes.isNullOrEmpty()&&!request.funcTypes.isNullOrEmpty()){
|
|
|
- val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
|
|
|
+ if (request.spaceIds.isNullOrEmpty()){
|
|
|
+ request.spaceIds = ArrayList()
|
|
|
+
|
|
|
+ val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
|
|
|
SFilter.eq("buildingId", request.buildingId!!), SFilter.eq("floorId", request.floorId!!)).exec()
|
|
|
- if (!spInFlList.isNullOrEmpty()) {
|
|
|
- val setIds = HashSet<String>()
|
|
|
- for (spInFl in spInFlList){
|
|
|
- request.spaceIds!!.add(spInFl.spaceId!!)
|
|
|
+ if (!spInFlList.isNullOrEmpty()) {
|
|
|
+ val setIds = HashSet<String>()
|
|
|
+ for (spInFl in spInFlList){
|
|
|
+ request.spaceIds!!.add(spInFl.spaceId!!)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (!request.spaceIds.isNullOrEmpty()) {
|
|
@@ -161,12 +163,14 @@ object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::c
|
|
|
}
|
|
|
|
|
|
} else if (!request.zoneTypes.isNullOrEmpty()){
|
|
|
- val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
|
|
|
- SFilter.eq("buildingId", request.buildingId!!), SFilter.eq("floorId", request.floorId!!)).exec()
|
|
|
- if (!spInFlList.isNullOrEmpty()) {
|
|
|
- val setIds = HashSet<String>()
|
|
|
- for (spInFl in spInFlList){
|
|
|
- request.spaceIds!!.add(spInFl.spaceId!!)
|
|
|
+ if (request.spaceIds.isNullOrEmpty()){
|
|
|
+ val spInFlList = spInFlService.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.inList("objectType", request.zoneTypes!!),
|
|
|
+ SFilter.eq("buildingId", request.buildingId!!), SFilter.eq("floorId", request.floorId!!)).exec()
|
|
|
+ if (!spInFlList.isNullOrEmpty()) {
|
|
|
+ val setIds = HashSet<String>()
|
|
|
+ for (spInFl in spInFlList){
|
|
|
+ request.spaceIds!!.add(spInFl.spaceId!!)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (!request.spaceIds.isNullOrEmpty()) {
|