diff --git a/src/main/resources/scripts/dict/enum/coalInfoDict.groovy b/src/main/resources/scripts/dict/enum/coalInfoDict.groovy index e6059870..4f4e0d22 100644 --- a/src/main/resources/scripts/dict/enum/coalInfoDict.groovy +++ b/src/main/resources/scripts/dict/enum/coalInfoDict.groovy @@ -5,7 +5,7 @@ import cn.lihongjie.coal.coalInfo.controller.CoalInfoController import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity import org.springframework.context.ApplicationContext -ApplicationContext ioc = ioc; +ApplicationContext ioc = ioc def controller = ioc.getBean(CoalInfoController.class) @@ -16,7 +16,7 @@ return controller.list(new CommonQuery()).content.collect { def entity = new CoalInfoEntity() entity.id = it.id entity.code = it.code - entity.name = it.supplierName + "-" + it.name - return entity; + entity.name = "$it.supplierName-$it.name($it.coalTypeName}" + return entity }