From bba89ee8ca908d7aabf00aa847b503ded5976589 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 28 Aug 2020 10:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/screen/dto/form/ProjectDetailFormDTO.java     | 6 ++++++
 .../com/epmet/datareport/dao/screen/ScreenEventDataDao.java | 2 +-
 .../service/screen/impl/ScreenProjectServiceImpl.java       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectDetailFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectDetailFormDTO.java
index 32359cb03e..88744ad004 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectDetailFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectDetailFormDTO.java
@@ -21,4 +21,10 @@ public class ProjectDetailFormDTO implements Serializable {
      */
     @NotBlank(message = "项目ID不能为空",groups = {ProjectDetail.class})
     private String projectId;
+
+    /**
+     * 机关iD
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {ProjectDetail.class})
+    private String agencyId;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
index 92f1641cce..24604bf1de 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
@@ -47,6 +47,6 @@ public interface ScreenEventDataDao{
      * @author zxc
      * @date 2020/8/19 4:36 下午
      */
-    ProjectDetailResultDTO selectEventDetail(@Param("projectId")String projectId);
+    ProjectDetailResultDTO selectEventDetail(@Param("projectId")String projectId,@Param("agencyId")String agencyId);
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
index dce609636d..e617449458 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
@@ -35,7 +35,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
     @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
     @Override
     public ProjectDetailResultDTO projectDetail(ProjectDetailFormDTO projectDetailFormDTO) {
-        ProjectDetailResultDTO projectDetailResultDTO = screenEventDataDao.selectEventDetail(projectDetailFormDTO.getProjectId());
+        ProjectDetailResultDTO projectDetailResultDTO = screenEventDataDao.selectEventDetail(projectDetailFormDTO.getProjectId(),projectDetailFormDTO.getAgencyId());
         if (null == projectDetailResultDTO){
             return new ProjectDetailResultDTO();
         }