From 16d5c433166f6ecddbfd307cb9f14a2c1d4516bd Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 16 Nov 2020 10:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=88=91=E5=8F=91?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=AF=9D=E9=A2=98-=E5=B7=B2=E8=BD=AC?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=EF=BC=8C=E6=88=91=E5=8F=91=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=E9=A2=98-=E5=B7=B2=E8=BD=AC=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=AE=E9=A2=98?= =?UTF-8?q?id=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=89=8D=E7=AB=AF=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ProjectOfCreateTopicUserResultDTO.java | 1 + .../src/main/resources/mapper/ProjectDao.xml | 8 +++++--- .../group/dto/topic/result/MyCreateTopicsResultDTO.java | 1 + .../src/main/resources/mapper/topic/ResiTopicDao.xml | 3 ++- .../resi/mine/dto/result/MyCreateTopicsResultDTO.java | 1 + .../mine/dto/result/MyShiftProjectTopicsResultDTO.java | 1 + 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOfCreateTopicUserResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOfCreateTopicUserResultDTO.java index 13b0fbfe1b..be6362471c 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOfCreateTopicUserResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOfCreateTopicUserResultDTO.java @@ -9,6 +9,7 @@ public class ProjectOfCreateTopicUserResultDTO { private String topicId; private String projectId; + private String issueId; private String gridId; private Long shiftProjectTime; private List departmentNameList; diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 61585d7407..a3747fe72e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -234,13 +234,15 @@ p.id as projectId, rp.GRID_ID gridId, p.TITLE as projectTitle, - rp.GRID_ID releaseGridId + rp.GRID_ID releaseGridId, + rp2.SOURCE_ID as issueId from project_related_personnel rp inner join project p on (rp.PROJECT_ID = p.ID and p.DEL_FLAG = 0) - where USER_ID = #{userId} + left join project_related_personnel rp2 on (rp.PROJECT_ID = rp2.PROJECT_ID and rp2.SOURCE_TYPE = 'issue') + where rp.USER_ID = #{userId} and p.CUSTOMER_ID=#{customerId} and p.DEL_FLAG=0 - and SOURCE_TYPE = 'topic' + and rp.SOURCE_TYPE = 'topic' order by p.CREATED_TIME desc diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyCreateTopicsResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyCreateTopicsResultDTO.java index c96aa8e99e..d5dc12d887 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyCreateTopicsResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyCreateTopicsResultDTO.java @@ -6,6 +6,7 @@ import lombok.Data; public class MyCreateTopicsResultDTO { private String topicId; + private String groupId; private Long releaseTime; private String topicContent; private String releaseGroupName; diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index db2d2f5fdb..ec3a974876 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -452,7 +452,8 @@ t.topic_content as topicContent, unix_timestamp(t.created_time) as releaseTime, g.GROUP_NAME as releaseGroupName, - g.GRID_ID as releaseGridId + g.GRID_ID as releaseGridId, + t.GROUP_ID as groupId from resi_topic t inner join resi_group g on (t.GROUP_ID = g.ID and g.CUSTOMER_ID = #{customerId}) where t.CREATED_BY = #{userId} diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyCreateTopicsResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyCreateTopicsResultDTO.java index e79e29e6b2..0be06a0eed 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyCreateTopicsResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyCreateTopicsResultDTO.java @@ -5,6 +5,7 @@ import lombok.Data; @Data public class MyCreateTopicsResultDTO { private String topicId; + private String groupId; private Long releaseTime; private String topicContent; private String releaseGroupName; diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyShiftProjectTopicsResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyShiftProjectTopicsResultDTO.java index c997cc9266..af2e1b80e7 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyShiftProjectTopicsResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyShiftProjectTopicsResultDTO.java @@ -8,6 +8,7 @@ import java.util.List; public class MyShiftProjectTopicsResultDTO { private String topicId; private String gridId; + private String issueId; private Long shiftProjectTime; private List departmentNameList; private String projectTitle;