|
@@ -204,21 +204,21 @@ 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()
|
|
|
+ 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),
|
|
@@ -228,9 +228,9 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
|
|
|
// SFilter.inList("code", setCode.toList())).order("code").exec()
|
|
|
// }
|
|
|
// }
|
|
|
-// dictStage.infos = funcIdList
|
|
|
-// logger.debug("阶段=${dictStage.code}*************************************************")
|
|
|
-// }
|
|
|
+ dictStage.infos = funcIdList
|
|
|
+ logger.debug("阶段=${dictStage.code}*************************************************")
|
|
|
+ }
|
|
|
logger.debug("结束*************************************************")
|
|
|
dictInfoResponse.basicInfos = defFuncIdList
|
|
|
// dictInfoResponse.dictStages = dictStageList
|