diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java index 9e7844c3ea..ae61ba1769 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -24,8 +25,14 @@ public class CategoryListResultDTO implements Serializable { */ private String categoryName; + private Integer count; + + private Integer codeLength; + public CategoryListResultDTO() { this.categoryCode = ""; this.categoryName = ""; + this.count = NumConstant.ZERO; + this.codeLength = NumConstant.ZERO; } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index a421f1c647..0030bb0a27 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -249,7 +249,8 @@ + SELECT + DISTINCT p.ID AS projectId, + p.CREATED_TIME AS createdTime, + LEFT(pc.CATEGORY_CODE,#{codeLength}) AS categoryCode + FROM project p + INNER JOIN project_category pc ON (pc.PROJECT_ID = p.ID AND pc.DEL_FLAG = 0) + WHERE p.DEL_FLAG = 0 + AND p.ORG_ID_PATH LIKE CONCAT('%',#{orgId}) + AND DATE_FORMAT(p.CREATED_TIME,'%Y-%m-%d') = #{date} + ORDER BY projectId + \ No newline at end of file