diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryTemplateServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryTemplateServiceImpl.java index 56fbfc16..23120dc9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryTemplateServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryTemplateServiceImpl.java @@ -203,9 +203,9 @@ public class PgsProgressCategoryTemplateServiceImpl extends ServiceImpl punchranges = BeanUtil.copyToList(punchrangeList, Punchrange.class); vo.setPunchrangeList(punchranges); } + + //项目类型 + if (vo.getProjectType() != null) { + XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(vo.getProjectType()); + if (xzdProjectTypeVo != null) { + vo.setProjectTypeName(xzdProjectTypeVo.getTypeName()); + } + } return vo; } @@ -744,7 +758,7 @@ public class BusProjectServiceImpl extends ServiceImpl