From a2dcf858be450eedc941315ba62ddbcd273cac94 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 3 Nov 2022 11:22:32 +0800
Subject: [PATCH] =?UTF-8?q?/icpartyactivity/search=E8=81=94=E5=BB=BA?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/PartyActivityFormDTO.java  |  1 +
 .../controller/IcPartyActivityController.java |  8 ++++-
 .../resources/mapper/IcPartyActivityDao.xml   | 36 +++++++++++--------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
index 0481b07fc4..fb67921cd8 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java
@@ -29,4 +29,5 @@ public class PartyActivityFormDTO implements Serializable {
     private String serviceMatter;
     private Integer pageNo;
     private Integer pageSize;
+    private String customerId;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
index 2ff977b4db..67b3c5da5a 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
@@ -71,8 +71,14 @@ public class IcPartyActivityController {
     @Resource
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
 
+    /**
+     * 联建活动-列表
+     * @param formDTO
+     * @return
+     */
     @PostMapping("search")
-    public Result<PageData<IcPartyActivityDTO>> page(@RequestBody PartyActivityFormDTO formDTO){
+    public Result<PageData<IcPartyActivityDTO>> page(@LoginUser TokenDto tokenDto,@RequestBody PartyActivityFormDTO formDTO){
+        formDTO.setCustomerId(formDTO.getCustomerId());
         PageData<IcPartyActivityDTO> page = icPartyActivityService.search(formDTO);
         return new Result<PageData<IcPartyActivityDTO>>().ok(page);
     }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
index 0c5c86d30d..bf3af69b84 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@@ -66,37 +66,43 @@
             ic_party_activity a
         INNER JOIN  (
             SELECT
-                ACTIVITY_ID,
-                GROUP_CONCAT( UNIT_ID ) AS unitId
+                ur.ACTIVITY_ID,
+                GROUP_CONCAT( ur.UNIT_ID ) AS unitId
             FROM
-                ic_activity_unit_relation
+                ic_activity_unit_relation ur
             WHERE
-                DEL_FLAG = '0'
-                AND AGENCY_ID = #{agencyId}
+                ur.DEL_FLAG = '0'
+                <if test='null != agencyId and "" != agencyId'>
+                    AND (ur.AGENCY_ID = #{agencyId} or ur.PIDS like concat('%',#{agencyId},'%'))
+                </if>
                 <if test='null != unitId and "" != unitId'>
-                    AND UNIT_ID = #{unitId}
+                    AND ur.UNIT_ID = #{unitId}
                 </if>
             GROUP BY
-                ACTIVITY_ID
+                ur.ACTIVITY_ID
             ) b ON a.ID = b.ACTIVITY_ID
         INNER JOIN  (
             SELECT
-                ACTIVITY_ID,
-                GROUP_CONCAT( SERVICE_MATTER ) AS serviceMatter
+                sr.ACTIVITY_ID,
+                GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter
             FROM
-                ic_activity_service_relation
+                ic_activity_service_relation sr
             WHERE
-                DEL_FLAG = '0'
-                AND AGENCY_ID = #{agencyId}
+                sr.DEL_FLAG = '0'
+                <if test='null != agencyId and "" != agencyId'>
+                    AND (sr.AGENCY_ID = #{agencyId} or sr.PIDS like concat('%',#{agencyId},'%'))
+                </if>
                 <if test='null != serviceMatter and "" != serviceMatter'>
-                    AND SERVICE_MATTER = #{serviceMatter}
+                    AND sr.SERVICE_MATTER = #{serviceMatter}
                 </if>
             GROUP BY
-                ACTIVITY_ID
+                sr.ACTIVITY_ID
             ) c ON a.ID = c.ACTIVITY_ID
         WHERE
             a.DEL_FLAG = '0'
-            AND a.AGENCY_ID = #{agencyId}
+            <if test='null != agencyId and "" != agencyId'>
+                AND (a.AGENCY_ID = #{agencyId} or a.PIDS like concat('%',#{agencyId},'%'))
+            </if>
             <if test='null != gridId and "" != gridId'>
                 AND a.GRID_ID = #{gridId}
             </if>