党支部新接口添加

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/BranchCountFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/10/27 11:08 上午
+ */
+@Data
+public class BranchCountFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4869326660700557193L;
+
+    public interface BranchCount{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "机关ID不能为空",groups = {BranchCount.class})
+    private String agencyId;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/BranchCountResultDTO.java

@@ -0,0 +1,45 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/10/27 11:03 上午
+ */
+@Data
+public class BranchCountResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5915969126291502360L;
+
+    private String agencyId;
+
+    /**
+     * 机关名称
+     */
+    private String name;
+
+    /**
+     * 中心点位
+     */
+    private String centerMark;
+
+    /**
+     * 社区下的党支部数
+     */
+    private Integer totalNum;
+
+    /**
+     * 坐标区域
+     */
+    private String areaMarks;
+
+    public BranchCountResultDTO() {
+        this.agencyId = "";
+        this.name = "";
+        this.centerMark = "";
+        this.totalNum = 0;
+        this.areaMarks = "";
+    }
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java

@@ -38,6 +38,18 @@ public class DistributionController {
         return new Result<List<BranchResultDTO>>().ok(distributionService.branch(formDTO));
     }
 
+    /**
+     * @Description  查询机关下的党支部
+     * @Param branchCountFormDTO
+     * @author zxc
+     * @date 2020/10/27 11:11 上午
+     */
+    @PostMapping("branchcount")
+    public Result<BranchCountResultDTO> branchCount(@RequestBody BranchCountFormDTO branchCountFormDTO){
+        ValidatorUtils.validateEntity(branchCountFormDTO, BranchCountFormDTO.BranchCount.class);
+        return new Result<BranchCountResultDTO>().ok(distributionService.branchCount(branchCountFormDTO));
+    }
+
     /**
      * @Description  2、用户分布  【只显示 is_display = 1 的数据】
      * @param userFormDTO

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerGridDao.java

@@ -48,6 +48,14 @@ public interface ScreenCustomerGridDao {
      */
     List<BranchResultDTO> selectBranch(@Param("agencyId")String agencyId);
 
+    /**
+     * @Description  查询机关下的党支部
+     * @Param branchCountFormDTO
+     * @author zxc
+     * @date 2020/10/27 11:11 上午
+     */
+    BranchCountResultDTO selectBranchCount(@Param("agencyId")String agencyId);
+
     /**
      * @Description  查询子级用户分布【网格级别】
      * @param parentId

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/DistributionService.java

@@ -21,6 +21,14 @@ public interface DistributionService {
      */
     List<BranchResultDTO> branch(BranchFormDTO formDTO);
 
+    /**
+     * @Description  查询机关下的党支部
+     * @Param branchCountFormDTO
+     * @author zxc
+     * @date 2020/10/27 11:11 上午
+     */
+    BranchCountResultDTO branchCount(BranchCountFormDTO branchCountFormDTO);
+
     /**
      * @Description  2、用户分布
      * @param  userFormDTO

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java

@@ -50,6 +50,21 @@ public class DistributionServiceImpl implements DistributionService {
         return branchResultDTOS;
     }
 
+    /**
+     * @Description  查询机关下的党支部
+     * @Param branchCountFormDTO
+     * @author zxc
+     * @date 2020/10/27 11:11 上午
+     */
+    @Override
+    public BranchCountResultDTO branchCount(BranchCountFormDTO branchCountFormDTO) {
+        BranchCountResultDTO branchCountResultDTO = screenCustomerGridDao.selectBranchCount(branchCountFormDTO.getAgencyId());
+        if (null == branchCountFormDTO){
+            return new BranchCountResultDTO();
+        }
+        return branchCountResultDTO;
+    }
+
     /**
      * @Description  2、用户分布
      * @param userFormDTO

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -26,10 +26,10 @@
             scg.party_mark AS partyMark
         FROM
             screen_customer_grid scg
-            LEFT JOIN screen_customer_biz_org bo ON bo.ORG_ID = scg.PARENT_AGENCY_ID
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = scg.PARENT_AGENCY_ID AND sca.IS_DISPLAY = 1
         WHERE
             scg.del_flag = 0
-            AND bo.BIZ_TYPE = 'community'
+            AND sca.DEL_FLAG = 0
             AND scg.all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 
@@ -84,4 +84,22 @@
         ORDER BY
             created_time DESC
     </select>
+
+    <!-- 查询机关下的党支部 -->
+    <select id="selectBranchCount" resultType="com.epmet.evaluationindex.screen.dto.result.BranchCountResultDTO">
+        SELECT
+            scg.PARENT_AGENCY_ID AS agencyId,
+            sca.AGENCY_NAME AS name,
+            IFNULL(sca.PARTY_MARK,'') AS partyMark,
+            IFNULL(sca.CENTER_MARK,'[]') AS centerMark,
+            COUNT(scg.ID) AS totalNum
+        FROM
+            screen_customer_grid scg
+            LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = scg.PARENT_AGENCY_ID AND sca.IS_DISPLAY = 1
+        WHERE
+            scg.del_flag = 0
+            AND sca.DEL_FLAG = 0
+            AND scg.all_parent_ids LIKE concat('%', #{agencyId}, '%')
+
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml

@@ -6,13 +6,14 @@
     <!-- 查询党员联系群众 -->
     <select id="selectContactMassLineChart" resultType="com.epmet.evaluationindex.screen.dto.result.ContactMassLineChartResult">
         SELECT
-            org_name AS orgName,
+            md.org_name AS orgName,
-            create_group_total AS groupTotal,
+            md.create_group_total AS groupTotal,
-            group_user_total AS userTotal
+            md.group_user_total AS userTotal
         FROM
-            screen_party_link_masses_data
+            screen_party_link_masses_data md
+            left join screen_customer_agency sca on sca.agency_id = md.parent_id and is_display = 1
         WHERE
-            del_flag = '0'
+            md.del_flag = '0'
-            AND parent_id = #{agencyId}
+            AND md.parent_id = #{agencyId}
     </select>
 </mapper>