|
@@ -21,12 +21,15 @@ import com.sybotan.database.SFilter
|
|
import com.sybotan.mybatis.SMybatisDao
|
|
import com.sybotan.mybatis.SMybatisDao
|
|
import com.sybotan.service.SBaseService
|
|
import com.sybotan.service.SBaseService
|
|
import com.sybotan.service.SObjectService
|
|
import com.sybotan.service.SObjectService
|
|
|
|
+import com.sybotan.service.SPageContext
|
|
import com.sybotan.service.models.requests.SQueryRequest
|
|
import com.sybotan.service.models.requests.SQueryRequest
|
|
import com.sybotan.service.utils.SSpringContextUtil
|
|
import com.sybotan.service.utils.SSpringContextUtil
|
|
import org.springframework.beans.factory.annotation.Autowired
|
|
import org.springframework.beans.factory.annotation.Autowired
|
|
import org.springframework.stereotype.Component
|
|
import org.springframework.stereotype.Component
|
|
import java.lang.StringBuilder
|
|
import java.lang.StringBuilder
|
|
import java.util.stream.Collectors
|
|
import java.util.stream.Collectors
|
|
|
|
+import javax.servlet.http.HttpServletRequest
|
|
|
|
+import javax.servlet.http.HttpServletRequestWrapper
|
|
import kotlin.collections.Map as Map
|
|
import kotlin.collections.Map as Map
|
|
|
|
|
|
@Component
|
|
@Component
|
|
@@ -46,7 +49,7 @@ class ModelCheckService {
|
|
// queryBuilder.tableName = "revit_calc.check_grid_valid('${projectId}', '${folderId}', '${modelId}')"
|
|
// queryBuilder.tableName = "revit_calc.check_grid_valid('${projectId}', '${folderId}', '${modelId}')"
|
|
// 查询楼层模型
|
|
// 查询楼层模型
|
|
var request = SQueryRequest()
|
|
var request = SQueryRequest()
|
|
- request.filters = " folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
|
|
|
|
|
|
+ request.filters = " projectId = '"+projectId+"' and folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
|
|
val select = FloorModelService.pageQuery(request)
|
|
val select = FloorModelService.pageQuery(request)
|
|
var list = select.content
|
|
var list = select.content
|
|
if(list == null || list.isEmpty()){
|
|
if(list == null || list.isEmpty()){
|
|
@@ -76,7 +79,7 @@ class ModelCheckService {
|
|
// return queryBuilder.exec()
|
|
// return queryBuilder.exec()
|
|
// 查询楼层模型
|
|
// 查询楼层模型
|
|
var request = SQueryRequest()
|
|
var request = SQueryRequest()
|
|
- request.filters = " folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
|
|
|
|
|
|
+ request.filters = " projectId = '"+projectId+"' and folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
|
|
val select = FloorModelService.pageQuery(request)
|
|
val select = FloorModelService.pageQuery(request)
|
|
var list = select.content
|
|
var list = select.content
|
|
if(list == null || list.isEmpty()){
|
|
if(list == null || list.isEmpty()){
|