|
@@ -5,6 +5,7 @@ import cn.sagacloud.server.algorithm.models.modelFile.ModelFileFolder
|
|
import cn.sagacloud.server.algorithm.models.responses.DataCheckListResponse
|
|
import cn.sagacloud.server.algorithm.models.responses.DataCheckListResponse
|
|
import cn.sagacloud.server.algorithm.services.BaseDataService
|
|
import cn.sagacloud.server.algorithm.services.BaseDataService
|
|
import cn.sagacloud.server.algorithm.services.comparator.FloorComparator
|
|
import cn.sagacloud.server.algorithm.services.comparator.FloorComparator
|
|
|
|
+import cn.sagacloud.server.algorithm.services.endpoint.FloorModelService
|
|
import cn.sagacloud.server.algorithm.services.endpoint.ReportService
|
|
import cn.sagacloud.server.algorithm.services.endpoint.ReportService
|
|
import cn.sagacloud.server.algorithm.services.excel.ExcelService
|
|
import cn.sagacloud.server.algorithm.services.excel.ExcelService
|
|
import cn.sagacloud.server.algorithm.services.modelCheck.TaskService
|
|
import cn.sagacloud.server.algorithm.services.modelCheck.TaskService
|
|
@@ -15,6 +16,7 @@ import com.sybotan.mybatis.SMybatisDao
|
|
import com.sybotan.service.SBaseService
|
|
import com.sybotan.service.SBaseService
|
|
import com.sybotan.service.SPageContext
|
|
import com.sybotan.service.SPageContext
|
|
import com.sybotan.service.models.enums.SResponseType
|
|
import com.sybotan.service.models.enums.SResponseType
|
|
|
|
+import com.sybotan.service.models.requests.SQueryRequest
|
|
import com.sybotan.service.models.responses.SBaseResponse
|
|
import com.sybotan.service.models.responses.SBaseResponse
|
|
import com.sybotan.service.models.responses.SQueryResponse
|
|
import com.sybotan.service.models.responses.SQueryResponse
|
|
import com.sybotan.service.utils.SSpringContextUtil
|
|
import com.sybotan.service.utils.SSpringContextUtil
|
|
@@ -67,11 +69,13 @@ class ReportController {
|
|
return errorResponse
|
|
return errorResponse
|
|
}
|
|
}
|
|
// val list = floorMapper.getFinishedFloor(request.projectId!!, request.id!!)
|
|
// val list = floorMapper.getFinishedFloor(request.projectId!!, request.id!!)
|
|
- val service = SBaseService(SMybatisDao(FloorModelView::class.java))
|
|
|
|
- val select = service.select(SFilter.eq("folderId", request.id!!), SFilter.Companion.eq("projectId", request.projectId!!), SFilter.Companion.eq("status", 4))
|
|
|
|
- select.tableName = "revit.model_floor_file_func('${SPageContext.getHeader("ProjectId")}')"
|
|
|
|
- var list = select.exec()
|
|
|
|
- if(list.isEmpty()){
|
|
|
|
|
|
+// val service = SBaseService(SMybatisDao(FloorModelView::class.java))
|
|
|
|
+// val select = FloorModelService.select(SFilter.eq("folderId", request.id!!), SFilter.Companion.eq("projectId", request.projectId!!), SFilter.Companion.eq("status", 4))
|
|
|
|
+// select.tableName = "revit.model_floor_file_func('${SPageContext.getHeader("ProjectId")}')"
|
|
|
|
+// var list = select.exec()
|
|
|
|
+ val select = FloorModelService.pageQuery(SQueryRequest(), arrayListOf(SFilter.eq("folderId", request.id!!), SFilter.Companion.eq("projectId", request.projectId!!), SFilter.Companion.eq("status", 4)))
|
|
|
|
+ var list = select.content
|
|
|
|
+ if(list == null || list.isEmpty()){
|
|
//errorResponse.message = "暂时没有可用楼层"
|
|
//errorResponse.message = "暂时没有可用楼层"
|
|
return sQueryResponse
|
|
return sQueryResponse
|
|
}
|
|
}
|
|
@@ -108,11 +112,13 @@ class ReportController {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
// val list = floorMapper.getFinishedFloor(request.projectId!!, request.id!!)
|
|
// val list = floorMapper.getFinishedFloor(request.projectId!!, request.id!!)
|
|
- val service = SBaseService(SMybatisDao(FloorModelView::class.java))
|
|
|
|
- val select = service.select(SFilter.eq("folderId", request.id!!), SFilter.Companion.eq("projectId", request.projectId!!), SFilter.Companion.eq("status", 4))
|
|
|
|
- select.tableName = "revit.model_floor_file_func('${SPageContext.getHeader("ProjectId")}')"
|
|
|
|
- var list = select.exec()
|
|
|
|
- if(list.isEmpty()){
|
|
|
|
|
|
+// val service = SBaseService(SMybatisDao(FloorModelView::class.java))
|
|
|
|
+// val select = FloorModelService.select(SFilter.eq("folderId", request.id!!), SFilter.Companion.eq("projectId", request.projectId!!), SFilter.Companion.eq("status", 4))
|
|
|
|
+// select.tableName = "revit.model_floor_file_func('${SPageContext.getHeader("ProjectId")}')"
|
|
|
|
+// var list = select.exec()
|
|
|
|
+ val select = FloorModelService.pageQuery(SQueryRequest(), arrayListOf(SFilter.eq("folderId", request.id!!), SFilter.Companion.eq("projectId", request.projectId!!), SFilter.Companion.eq("status", 4)))
|
|
|
|
+ var list = select.content
|
|
|
|
+ if(list == null || list.isEmpty()){
|
|
errorResponse.message = "没有可以下载的报告"
|
|
errorResponse.message = "没有可以下载的报告"
|
|
response.contentType = "application/json;charset=utf-8"
|
|
response.contentType = "application/json;charset=utf-8"
|
|
response.flushBuffer()
|
|
response.flushBuffer()
|