党小组

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyOrgTypeEnum.java

@@ -9,7 +9,9 @@ public enum PartyOrgTypeEnum {
     DISTRICT("2", "区委"),
     WORKING("3", "党工委"),
     PARTY("4", "党委"),
-    BRANCH("5", "支部");
+    BRANCH("5", "支部"),
+
+    GROUP("6", "党小组");
 
 
     private String code;

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/YiFengScreenPartyOrgCategoryResultDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+/**
+ * 移风大屏，党组织和数量dto
+ */
+@Data
+public class YiFengScreenPartyOrgCategoryResultDTO {
+
+    private String partyOrgType;
+    private String name;
+    private Integer value;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java

@@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.*;
 import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgCategoryResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgTreeResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.YiFengScreenPartyOrgCategoryResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.YiFengScreenPartyOrgTreeResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -139,6 +140,10 @@ public interface IcPartyOrgDao extends BaseDao<IcPartyOrgEntity> {
                                                                                   @Param("agencyId") String agencyId,
                                                                                   @Param("agencyOrgIdPath") String agencyOrgIdPath);
 
+    List<YiFengScreenPartyOrgCategoryResultDTO> listPartyOrgCategoryAndQuantityForYiFeng(@Param("customerId") String customerId,
+                                                                                  @Param("agencyId") String agencyId,
+                                                                                  @Param("agencyOrgIdPath") String agencyOrgIdPath);
+
     List<LingShanScreenPartyOrgTreeResultDTO.PartyOrg> getPartyOrgsLteDangwei(@Param("customerId") String customerId,
                                                                                @Param("agencyId") String agencyId,
                                                                                @Param("orgIdpath") String orgIdpath);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java

@@ -56,8 +56,9 @@ public class YiFengScreenController {
      * @date: 2023/4/14 10:57 AM
      */
     @GetMapping("partyOrgCategoryAndQuantity")
-    public Result<List<LingShanScreenPartyOrgCategoryResultDTO>> listPartyOrgCategoryAndQuantity(@RequestParam("agencyId") String agencyId) {
+    public Result<List<YiFengScreenPartyOrgCategoryResultDTO>> listPartyOrgCategoryAndQuantity() {
-        List<LingShanScreenPartyOrgCategoryResultDTO> l = yiFengScreenService.listPartyOrgCategoryAndQuantity(agencyId);
+        String agencyId = "1739891126105206786";
+        List<YiFengScreenPartyOrgCategoryResultDTO> l = yiFengScreenService.listPartyOrgCategoryAndQuantity(agencyId);
         return new Result().ok(l);
     }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/YiFengScreenService.java

@@ -13,7 +13,7 @@ public interface YiFengScreenService {
      * @author: WangXianZhang
      * @date: 2023/4/14 11:02 AM
      */
-    List<LingShanScreenPartyOrgCategoryResultDTO> listPartyOrgCategoryAndQuantity(String agencyId);
+    List<YiFengScreenPartyOrgCategoryResultDTO> listPartyOrgCategoryAndQuantity(String agencyId);
 
     /**
      * @description: 党建活动类型和数量

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/YiFengScreenServiceImpl.java

@@ -58,12 +58,12 @@ public class YiFengScreenServiceImpl implements YiFengScreenService, ResultDataR
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
-    public List<LingShanScreenPartyOrgCategoryResultDTO> listPartyOrgCategoryAndQuantity(String agencyId) {
+    public List<YiFengScreenPartyOrgCategoryResultDTO> listPartyOrgCategoryAndQuantity(String agencyId) {
         AgencyInfoCache agencyInfo = null;
         try {
             agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId);
         } catch (Exception e) {
-            logger.error("【灵山大屏-党对象数量查询】组织未找到:" + agencyId);
+            logger.error("【移风大屏-党对象数量查询】组织未找到:" + agencyId);
             return new ArrayList<>();
         }
 
@@ -72,8 +72,8 @@ public class YiFengScreenServiceImpl implements YiFengScreenService, ResultDataR
         }
 
         // 1.查询党组织
-        List<LingShanScreenPartyOrgCategoryResultDTO> l = icPartyOrgDao
+        List<YiFengScreenPartyOrgCategoryResultDTO> l = icPartyOrgDao
-                .listPartyOrgCategoryAndQuantity(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids()));
+                .listPartyOrgCategoryAndQuantityForYiFeng("1739891126105206785", agencyId, PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids()));
 
         // 给组织类型名字赋值
         l.forEach(i -> {
@@ -83,18 +83,18 @@ public class YiFengScreenServiceImpl implements YiFengScreenService, ResultDataR
             }
         });
 
-        // 2.查询党小组
+/*        // 2.查询党小组
         Integer groupQty = getResultDataOrReturnNull(groupOpenFeignClient.getPartyGroupQuantityByAgencyId(agencyId), ServiceConstant.RESI_GROUP_SERVER);
         if (groupQty == null) {
-            logger.error("【灵山大屏】党建引领-查询党小组信息失败,agencyId：" + agencyId);
+            logger.error("【移风大屏】党建引领-查询党小组信息失败,agencyId：" + agencyId);
             groupQty = 0;
         }
 
-        LingShanScreenPartyOrgCategoryResultDTO gq = new LingShanScreenPartyOrgCategoryResultDTO();
+        YiFengScreenPartyOrgCategoryResultDTO gq = new YiFengScreenPartyOrgCategoryResultDTO();
         gq.setName("党小组");
         gq.setPartyOrgType(null);
         gq.setValue(groupQty);
-        l.add(gq);
+        l.add(gq);*/
 
         return l;
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

@@ -261,6 +261,17 @@
         order by PARTY_ORG_TYPE asc
     </select>
 
+    <select id="listPartyOrgCategoryAndQuantityForYiFeng"
+            resultType="com.epmet.resi.partymember.dto.partymember.result.YiFengScreenPartyOrgCategoryResultDTO">
+        select PARTY_ORG_TYPE partyOrgType, count(*) as 'value'
+        from ic_party_org
+        where CUSTOMER_ID=#{customerId}
+          and (AGENCY_PIDS like CONCAT(#{agencyOrgIdPath}, '%') or AGENCY_ID = #{agencyId})
+          and DEL_FLAG = 0
+        group by PARTY_ORG_TYPE
+        order by PARTY_ORG_TYPE asc
+    </select>
+
     <!--获取党委以上组织列表-->
     <select id="getPartyOrgsLteDangwei"
             resultType="com.epmet.resi.partymember.dto.partymember.result.LingShanScreenPartyOrgTreeResultDTO$PartyOrg">