瀏覽代碼

****************************************提交分类************************************

weixinVSjinlai 4 年之前
父節點
當前提交
901d189067
共有 1 個文件被更改,包括 28 次插入28 次删除
  1. 28 28
      equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt

+ 28 - 28
equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt

@@ -204,36 +204,36 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
                 }
             }
 
-            val dictStageList = dictStageService.selectAll().exec()
-            for (dictStage in dictStageList) {
-                val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0")
-                        ,SFilter.eq("classCode", category),SFilter.eq("stage", dictStage.code!!)).exec()
-                val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!)
-                        ,SFilter.eq("classCode", category),SFilter.eq("stage", dictStage.code!!)).exec()
-                if (dictInfosWanDaProjectList.size>0){
-                    dictInfosWanDaGroupList.addAll(dictInfosWanDaProjectList)
-                }
-                var setCode = HashSet<String>()
-                for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
-                    setCode.add(dictInfosWanDaGroup.code!!)
-                }
-                var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
-                        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.eq("classCode", category),
-                            SFilter.inList("code", setCode.toList())).order("code").exec()
-                    if (funcIdList.size == 0) {
-                        funcIdList = DefFuncIdService.select(SFilter.eq("type","common"),SFilter.eq("classCode", category),
-                                SFilter.inList("code",  setCode.toList())).order("code").exec()
-                    }
-                }
-                dictStage.infos = funcIdList
-                logger.debug("阶段=${dictStage.code}*************************************************")
-            }
+//            val dictStageList = dictStageService.selectAll().exec()
+//            for (dictStage in dictStageList) {
+//                val dictInfosWanDaGroupList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", "0")
+//                        ,SFilter.eq("classCode", category),SFilter.eq("stage", dictStage.code!!)).exec()
+//                val dictInfosWanDaProjectList = dictInfosWanDaService.select(SFilter.eq("groupCode", Opt.groupCode!!), SFilter.eq("projectId", Opt.projectId!!)
+//                        ,SFilter.eq("classCode", category),SFilter.eq("stage", dictStage.code!!)).exec()
+//                if (dictInfosWanDaProjectList.size>0){
+//                    dictInfosWanDaGroupList.addAll(dictInfosWanDaProjectList)
+//                }
+//                var setCode = HashSet<String>()
+//                for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
+//                    setCode.add(dictInfosWanDaGroup.code!!)
+//                }
+//                var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
+//                        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.eq("classCode", category),
+//                            SFilter.inList("code", setCode.toList())).order("code").exec()
+//                    if (funcIdList.size == 0) {
+//                        funcIdList = DefFuncIdService.select(SFilter.eq("type","common"),SFilter.eq("classCode", category),
+//                                SFilter.inList("code",  setCode.toList())).order("code").exec()
+//                    }
+//                }
+//                dictStage.infos = funcIdList
+//                logger.debug("阶段=${dictStage.code}*************************************************")
+//        }
             logger.debug("结束*************************************************")
             dictInfoResponse.basicInfos = defFuncIdList
-            dictInfoResponse.dictStages = dictStageList
+//            dictInfoResponse.dictStages = dictStageList
             dictInfoResponse.result = SResponseType.success
 
             val list = ArrayList<DictInfoResponse>()