党员统计

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

@@ -0,0 +1,30 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 数字平台党员统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-17
+ */
+@Data
+public class IcPartyMemberCensusResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String orgId;
+
+    private String orgName;
+
+    private Integer count;
+
+}

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

@@ -0,0 +1,31 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 数字平台党员统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-17
+ */
+@Data
+public class IcPartyYearMemberCensusResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer sanshiyixia;
+
+    private Integer sishi;
+
+    private Integer wushi;
+
+    private Integer liushi;
+
+    private Integer qishi;
+
+    private Integer qishiyishang;
+
+}

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

@@ -6,10 +6,7 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO;
 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.*;
-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;
 
@@ -172,4 +169,6 @@ public interface IcPartyOrgDao extends BaseDao<IcPartyOrgEntity> {
      * @Date: 2023/5/12 4:05 PM
      */
     List<LingShanScreenPartyObjectByTypeRstDTO> lingshanListZsBranchs(@Param("orgId") String orgId);
+
+    List<IcPartyMemberCensusResultDTO> selectOrgParty();
 }

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

@@ -2,6 +2,8 @@ package com.epmet.modules.partyOrg.service;
 
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanPartyOrgAndOtherObjQtyRstDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberCensusResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyYearMemberCensusResultDTO;
 
 import java.util.List;
 
@@ -9,4 +11,7 @@ public interface YiFengPartyOrgService {
     List<LingShanPartyOrgAndOtherObjQtyRstDTO> partyOrgAndOtherObjectQtyStats(String agencyId);
 
     List<LingShanScreenPartyObjectByTypeRstDTO> partyObjsByType(String objType, String orgId, String orgType);
+    List<IcPartyMemberCensusResultDTO> selectOrgPartyMemberCensus();
+
+    IcPartyYearMemberCensusResultDTO selectYearPartyMemberCensus();
 }

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

@@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.enums.OrgLevelEnum;
 import com.epmet.commons.tools.enums.PartyOrgTypeEnum;
@@ -20,8 +21,12 @@ import com.epmet.modules.partyOrg.dao.IcPartyOrgDao;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
 import com.epmet.modules.partyOrg.service.LingShanPartyOrgService;
 import com.epmet.modules.partyOrg.service.YiFengPartyOrgService;
+import com.epmet.modules.partymember.dao.IcPartyMemberDao;
+import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanPartyOrgAndOtherObjQtyRstDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberCensusResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyYearMemberCensusResultDTO;
 import com.epmet.resi.partymember.enums.LingShanPartyObjEnums;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +41,9 @@ public class YiFengPartyOrgServiceImpl implements YiFengPartyOrgService, ResultD
     @Autowired
     private IcPartyOrgDao partyOrgDao;
 
+    @Autowired
+    private IcPartyMemberDao partyMemberDao;
+
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
@@ -173,6 +181,28 @@ public class YiFengPartyOrgServiceImpl implements YiFengPartyOrgService, ResultD
         }
     }
 
+    @Override
+    public List<IcPartyMemberCensusResultDTO> selectOrgPartyMemberCensus() {
+
+        List<IcPartyMemberCensusResultDTO> resultDTOS = partyOrgDao.selectOrgParty();
+        resultDTOS.forEach(result->{
+
+            LambdaQueryWrapper<IcPartyMemberEntity> partyMemberEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcPartyMemberEntity>()
+                    .like(IcPartyMemberEntity::getOrgPids,result.getOrgId());
+            result.setCount(partyMemberDao.selectCount(partyMemberEntityLambdaQueryWrapper));
+
+        });
+
+        return resultDTOS;
+    }
+
+    @Override
+    public IcPartyYearMemberCensusResultDTO selectYearPartyMemberCensus() {
+
+        return partyMemberDao.selectYearPartyMemberCensus();
+    }
+
+
     /**
      * @Description:  查询党委列表
      * @param orgId:

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

@@ -66,6 +66,31 @@ public class YiFengScreenController {
     @Autowired
     private IcParameterConfigService icParameterConfigService;
 
+    /**
+     * @Description: 党员年龄统计
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.partymember.result.IcPartyYearMemberCensusResultDTO>
+     * @Author: lichao
+     * @Date: 2024/3/12 17:02
+     */
+    @GetMapping("selectYearPartyMemberCensus")
+    public Result<IcPartyYearMemberCensusResultDTO> selectYearPartyMemberCensus(){
+        IcPartyYearMemberCensusResultDTO result = yiFengPartyOrgService.selectYearPartyMemberCensus();
+        return new Result<IcPartyYearMemberCensusResultDTO>().ok(result);
+    }
+
+    /**
+     * @Description: 组织党员统计
+     * @param :
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberCensusResultDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/12 17:02
+     */
+    @GetMapping("selectOrgPartyMemberCensus")
+    public Result<List<IcPartyMemberCensusResultDTO>> selectOrgPartyMemberCensus(){
+        List<IcPartyMemberCensusResultDTO> result = yiFengPartyOrgService.selectOrgPartyMemberCensus();
+        return new Result<List<IcPartyMemberCensusResultDTO>>().ok(result);
+    }
 
     /**
      * @Description: 参数配置

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

@@ -8,6 +8,7 @@ import com.epmet.modules.partymember.entity.IcPartyMemberEntity;
 import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO;
 import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyYearMemberCensusResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -80,4 +81,6 @@ public interface IcPartyMemberDao extends BaseDao<IcPartyMemberEntity> {
     List<OptionDataResultDTO> getPartyMemberAgeStatistics(@Param("agencyId") String agencyId,@Param("orgId") String orgId);
 
     IcPartyInfoResultDTO selectByUserId(@Param("userId") String userId);
+
+    IcPartyYearMemberCensusResultDTO selectYearPartyMemberCensus();
 }

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

@@ -235,6 +235,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         //分页查询
         LambdaQueryWrapper<IcPartymemberStyleEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartymemberStyleEntity::getCustomerId,"1739891126105206785");
         wrapper.eq(StringUtils.isNotBlank(formDTO.getAgencyId()),IcPartymemberStyleEntity::getAgencyId, formDTO.getAgencyId());
         wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcPartymemberStyleEntity::getGridId, formDTO.getGridId());
         wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName());

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

@@ -363,4 +363,19 @@
         group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE
     </select>
 
+    <select id="selectOrgParty"
+            resultType="com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberCensusResultDTO">
+
+        SELECT
+            org.ID AS orgId,
+            org.PARTY_ORG_NAME AS orgName
+        FROM
+            ic_party_org org
+        WHERE
+            org.DEL_FLAG = 0
+          AND org.PARTY_ORG_TYPE = 4
+          AND org.CUSTOMER_ID = '1739891126105206785'
+
+    </select>
+
 </mapper>

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

@@ -315,5 +315,23 @@
         AND pi.user_id = #{userId}
         and pi.CONFIRM_RESULT in('approved','auto_confirm_success')
     </select>
+    <select id="selectYearPartyMemberCensus"
+            resultType="com.epmet.resi.partymember.dto.partymember.result.IcPartyYearMemberCensusResultDTO">
+
+        SELECT
+            IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(ID_CARD, 7, 8), '%Y%m%d'), CURDATE()) BETWEEN 18 AND 30 THEN 1 ELSE 0 END),0) AS sanshiyixia,
+            IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(ID_CARD, 7, 8), '%Y%m%d'), CURDATE()) BETWEEN 31 AND 40 THEN 1 ELSE 0 END),0) AS sishi,
+            IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(ID_CARD, 7, 8), '%Y%m%d'), CURDATE()) BETWEEN 41 AND 50 THEN 1 ELSE 0 END),0) AS wushi,
+            IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(ID_CARD, 7, 8), '%Y%m%d'), CURDATE()) BETWEEN 51 AND 60 THEN 1 ELSE 0 END),0) AS liushi,
+            IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(ID_CARD, 7, 8), '%Y%m%d'), CURDATE()) BETWEEN 61 AND 70 THEN 1 ELSE 0 END),0) AS qishi,
+            IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, STR_TO_DATE(SUBSTRING(ID_CARD, 7, 8), '%Y%m%d'), CURDATE()) >70 THEN 1 ELSE 0 END),0) AS qishiyishang
+        FROM
+            ic_party_member
+        where
+            DEL_FLAG = 0
+          and
+            CUSTOMER_ID = '1739891126105206785'
+
+    </select>
 
 </mapper>