党员统计

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

@@ -19,7 +19,11 @@ package com.epmet.modules.partyOrg.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgCensusEntity;
+import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgCensusDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 党组织统计
@@ -29,5 +33,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcPartyOrgCensusDao extends BaseDao<IcPartyOrgCensusEntity> {
-	
+
+    List<IcPartyOrgCensusDTO> partyOrgCensusList();
+
+    List<IcPartyOrgCensusDTO> partyOrgCensusListAll();
 }

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

@@ -93,4 +93,6 @@ public interface IcPartyOrgCensusService extends BaseService<IcPartyOrgCensusEnt
      * @date 2024-03-07
      */
     void delete(String[] ids);
+
+    List<IcPartyOrgCensusDTO> partyOrgCensusList(String type);
 }

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

@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -98,4 +99,15 @@ public class IcPartyOrgCensusServiceImpl extends BaseServiceImpl<IcPartyOrgCensu
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<IcPartyOrgCensusDTO> partyOrgCensusList(String type) {
+        List<IcPartyOrgCensusDTO> result= new ArrayList<>();
+        if (type.equals("1")){
+            result =  baseDao.partyOrgCensusList();
+        }else if (type.equals("2")){
+            result =  baseDao.partyOrgCensusListAll();
+        }
+        return result;
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.modules.partyOrg.service.IcPartyOrgCensusService;
 import com.epmet.modules.partyOrg.service.IcPartyOrgLeaderService;
 import com.epmet.modules.partyOrg.service.YiFengPartyOrgService;
 import com.epmet.modules.partymember.service.IcPartyPlaceService;
@@ -17,6 +18,7 @@ import com.epmet.resi.partymember.dto.IcPartyPlaceDTO;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
+import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgCensusDTO;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgLeaderDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanPartyOrgAndOtherObjQtyRstDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO;
@@ -47,7 +49,22 @@ public class YiFengScreenController {
     @Autowired
     private IcPartyOrgLeaderService icPartyOrgLeaderService;
 
+    @Autowired
+    private IcPartyOrgCensusService icPartyOrgCensusService;
+
 
+    /**
+     * @Description: 党组织统计列表
+     * @param type:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgCensusDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/7 13:35
+     */
+    @GetMapping("partyOrgCensusList")
+    public Result<List<IcPartyOrgCensusDTO>> partyOrgCensusList(@RequestParam String type){
+        List<IcPartyOrgCensusDTO> result = icPartyOrgCensusService.partyOrgCensusList(type);
+        return new Result<List<IcPartyOrgCensusDTO>>().ok(result);
+    }
     /**
      * @Description: 领导班子列表
      * @param type:

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

@@ -18,6 +18,30 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="partyOrgCensusList" resultType="com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgCensusDTO">
+
+        select org.PARTY_ORG_NAME as orgName,
+        census.NATURAL_VILLAGE_COUNT,
+        census.GRID_COUNT
+        from ic_party_org_census census
+        left join ic_party_org org on org.ID = census.PARTY_ORG_ID
+        where
+        census.DEL_FLAG = 0
+
+    </select>
+
+    <select id="partyOrgCensusListAll" resultType="com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgCensusDTO">
+
+        select org.PARTY_ORG_NAME as orgName,
+               census.NATURAL_VILLAGE_COUNT,
+               census.GRID_COUNT,
+               census.PARTY_MEMBER_CENTER_COUNT as partyMemberCenterCount
+        from ic_party_org_census census
+                 left join ic_party_org org on org.ID = census.PARTY_ORG_ID
+        where
+            census.DEL_FLAG = 0
+
+    </select>
 
 
 </mapper>