From ca6f7ea0ca295327d92f517de3494daa7f9dd609 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 27 Feb 2024 18:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E8=89=B2=E7=A7=BB=E9=A3=8E=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/YiFengScreenController.java    | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
index f07477d5b1..6c70e1c4ec 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
@@ -37,7 +37,13 @@ public class YiFengScreenController {
     private YiFengPartyOrgService yiFengPartyOrgService;
 
 
-
+    /**
+     * @Description: 移风大屏-党员活动列表
+     * @param formDTO:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO>>
+     * @Author: lichao
+     * @Date: 2024/2/27 15:43
+     */
     @PostMapping("act-page-list")
     public Result<PageData<IcPartyActPageResultDTO>> actPageList(@RequestBody IcPartyActPageFormDTO formDTO){
         formDTO.setCustomerId("1739891126105206785");
@@ -46,6 +52,13 @@ public class YiFengScreenController {
         return new Result<PageData<IcPartyActPageResultDTO>>().ok(yiFengScreenService.actPageList(formDTO));
     }
 
+    /**
+     * @Description: 移风大屏-党员活动详情
+     * @param icPartyActId:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO>
+     * @Author: lichao
+     * @Date: 2024/2/27 15:43
+     */
     @PostMapping("act-detail/{icPartyActId}")
     public Result<IcPartyActDetailResDTO> actDetail(@PathVariable("icPartyActId")String icPartyActId){
         if(StringUtils.isBlank(icPartyActId)){
@@ -55,11 +68,11 @@ public class YiFengScreenController {
     }
 
     /**
-     * @description: 党组织数(只到党支部，没有小组)
+     * @Description: 党组织数
      * @param :
-     * @return
-     * @author: WangXianZhang
-     * @date: 2023/4/14 1:00 PM
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.partymember.result.YiFengScreenPartyOrgTreeResultDTO>
+     * @Author: lichao
+     * @Date: 2024/2/27 15:52
      */
     @GetMapping("partyOrgTree")
     public Result<YiFengScreenPartyOrgTreeResultDTO> getPartyOrgTree() {
@@ -70,11 +83,11 @@ public class YiFengScreenController {
 
 
     /**
-     * @description: 党建引领，党组织和数量
-     * @param : 当前组织id
-     * @return com.epmet.commons.tools.utils.Result
-     * @author: WangXianZhang
-     * @date: 2023/4/14 10:57 AM
+     * @Description: 党建引领，党组织和数量
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.YiFengScreenPartyOrgCategoryResultDTO>>
+     * @Author: lichao
+     * @Date: 2024/2/27 15:52
      */
     @GetMapping("partyOrgCategoryAndQuantity")
     public Result<List<YiFengScreenPartyOrgCategoryResultDTO>> listPartyOrgCategoryAndQuantity() {
@@ -84,11 +97,11 @@ public class YiFengScreenController {
     }
 
     /**
-     * @description: 党建活动类型和数量
-     * @param agencyId: 组织id
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgCategoryResultDTO>>
-     * @author: WangXianZhang
-     * @date: 2023/4/14 12:03 PM
+     * @Description: 党建活动类型和数量
+     * @param agencyId:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyActTypeAndQtyResultDTO>>
+     * @Author: lichao
+     * @Date: 2024/2/27 15:53
      */
     @GetMapping("partyActTypeAndQuantity")
     public Result<List<LingShanScreenPartyActTypeAndQtyResultDTO>> partyActTypeAndQuantity(@RequestParam("agencyId") String agencyId) {