|
@@ -150,7 +150,7 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
|
|
|
return try {
|
|
|
val projectId = SPageContext.getHeader("projectId").toString()
|
|
|
var request = SQueryRequest()
|
|
|
- request.filters = " buildingId is not null and floorId is not null ";
|
|
|
+ request.filters = "not buildingId isnull ; not floorId isnull";
|
|
|
request.projection = arrayListOf("buildingId", "floorId")
|
|
|
request.distinct = true
|
|
|
val tasks = ArrayList<ScanTaskBase>()
|
|
@@ -174,12 +174,13 @@ object ScanTaskBaseService : RService<ScanTaskBase>(SMybatisDao(ScanTaskBase::cl
|
|
|
val builds = tasks.map { it.buildingId }
|
|
|
val floors = tasks.map { it.floorId }
|
|
|
var buildingRequest = SQueryRequest()
|
|
|
- buildingRequest.filters = "id in (" +builds!!.joinToString(",", ",", "'") + ")"
|
|
|
+
|
|
|
+ buildingRequest.filters = "id in (" +builds!!.joinToString(",", ",", "'").substring(1) + ")"
|
|
|
buildingRequest.pageSize = 1000
|
|
|
buildingRequest.pageNumber = 1
|
|
|
var cascade = SCascadeQuery()
|
|
|
cascade.name = "floor"
|
|
|
- cascade.filters = "id in (" +floors!!.joinToString(",", ",", "'") + ")"
|
|
|
+ cascade.filters = "id in (" +floors!!.joinToString(",", ",", "'").substring(1) + ")"
|
|
|
buildingRequest.cascade = arrayListOf(cascade)
|
|
|
// TODO 调用adm-middleware建筑查询接口
|
|
|
pageQuery.content = admBaseService?.queryBuilding(buildingRequest) as ArrayList<BuildingDic>?
|