|
@@ -94,10 +94,10 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
|
|
|
*/
|
|
|
fun dictEquipInfoQuery(category: String): DictInfoResponse {
|
|
|
val dictInfoResponse = DictInfoResponse()
|
|
|
- val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0")
|
|
|
- ,SFilter.eq("classCode", category)).exec()
|
|
|
- val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!)
|
|
|
- ,SFilter.eq("classCode", category)).exec()
|
|
|
+// val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0")
|
|
|
+// ,SFilter.eq("classCode", category)).exec()
|
|
|
+// val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!)
|
|
|
+// ,SFilter.eq("classCode", category)).exec()
|
|
|
var defFuncIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),
|
|
|
SFilter.inList("code", arrayListOf("bimTypeId","name","localName","localId"))).exec()
|
|
|
if (defFuncIdList.size == 0 ) {
|
|
@@ -139,6 +139,7 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
|
|
|
SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
if (funcIdList.size == 0 ) {
|
|
|
funcIdList = DefFuncIdService.select(SFilter.eq("type","group"),
|
|
|
+ SFilter.eq("groupCode",Opt.groupCode!!),
|
|
|
SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
if (funcIdList.size == 0) {
|
|
|
funcIdList = DefFuncIdService.select(SFilter.eq("type","common"),
|