/icpartyactivity/search联建活动，列表查询

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;
 }

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);
     }

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>