diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectRespVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectRespVO.java index 2bf248e..0e6ca44 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectRespVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectRespVO.java @@ -92,7 +92,16 @@ public class ProjectRespVO implements VO { @ExcelProperty("备注") private String remark; + @Schema(description = "评论数") + @ExcelProperty("评论数") + private Integer commentNum; + + @Schema(description = "最后修改时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("最后修改时间") + private LocalDateTime updateTime; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; + } \ No newline at end of file diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java index 5593fea..9dcfb7c 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java @@ -9,6 +9,7 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; +import org.agt.module.license.controller.admin.comment.vo.CommentTreeRespVO; import org.agt.module.license.controller.admin.license.vo.ImportRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectImportRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectListReqVO; @@ -17,6 +18,7 @@ import org.agt.module.license.controller.admin.project.vo.ProjectRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectSaveReqVO; import org.agt.module.license.dal.dataobject.customer.CustomerDO; import org.agt.module.license.dal.dataobject.project.ProjectDO; +import org.agt.module.license.dal.mysql.comment.CommentMapper; import org.agt.module.license.dal.mysql.customer.CustomerMapper; import org.agt.module.license.dal.mysql.project.ProjectMapper; import org.springframework.stereotype.Service; @@ -48,6 +50,9 @@ public class ProjectServiceImpl implements ProjectService { @Resource private CustomerMapper customerMapper; + @Resource + private CommentMapper commentMapper; + @Override public Long createProject(ProjectSaveReqVO createReqVO) { // 校验项目名称和编号是否唯一 @@ -103,6 +108,11 @@ public class ProjectServiceImpl implements ProjectService { @Override public PageResult getProjectPage(ProjectPageReqVO pageReqVO) { IPage page = projectMapper.queryPage(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO); + + for (ProjectRespVO record : page.getRecords()) { + List comments = commentMapper.getCommentList(record.getId()); + record.setCommentNum(comments.size()); + } return new PageResult<>(page.getRecords(), page.getTotal()); }