Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen

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

@@ -21,4 +21,9 @@ public class ContactMassLineChartFormDTO implements Serializable {
      */
     @NotBlank(message = "机关ID不能为空",groups = {ContactMassLineChart.class})
     private String agencyId;
+
+    /**
+     * 目前只有平阴在传，默认赋值：370124
+     */
+    private String areaCode;
 }

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

@@ -150,4 +150,5 @@ public interface ScreenCustomerAgencyDao {
      **/
     List<GridNodeDTO> selectGridList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId);
 
+    List<String> getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId);
 }

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

@@ -40,4 +40,5 @@ public interface ScreenPartyLinkMassesDataDao  {
      */
     List<ContactMassLineChartResult> selectContactMassLineChart(@Param("agencyId")String agencyId);
 
+    List<ContactMassLineChartResult> selectContactMassLineChartByAgencyIds(@Param("agencyIdList")List<String> agencyIdList);
 }

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

@@ -61,4 +61,13 @@ public interface AgencyService {
     AgencyNodeDTO queryStaffAgencyTree(String agencyId);
 
     ScreenCustomerAgencyDTO queryAgencyInfo(String agencyId);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param agencyId
+     * @author yinzuomei
+     * @description 获取当前组织的下级组织集合
+     * @Date 2021/2/25 16:52
+     **/
+    List<String> getNextAgencyIds(String areaCode,String agencyId);
 }

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

@@ -297,4 +297,17 @@ public class AgencyServiceImpl implements AgencyService {
     public ScreenCustomerAgencyDTO queryAgencyInfo(String agencyId) {
         return screenCustomerAgencyDao.selectByAgencyId(agencyId);
     }
+
+    /**
+     * @param agencyId
+     * @return java.util.List<java.lang.String>
+     * @author yinzuomei
+     * @description 获取当前组织的下级组织集合
+     * @Date 2021/2/25 16:52
+     **/
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @Override
+    public List<String> getNextAgencyIds(String areaCode,String agencyId) {
+        return screenCustomerAgencyDao.getNextAgencyIds(areaCode,agencyId);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.datareport.service.evaluationindex.screen.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -7,6 +8,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.*;
+import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
 import com.epmet.datareport.service.evaluationindex.screen.PartyMemberLeadService;
 import com.epmet.datareport.utils.DateUtils;
 import com.epmet.datareport.utils.ModuleConstant;
@@ -56,6 +58,9 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     private ScreenCustomerAgencyDao customerAgencyDao;
     @Autowired
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
+    @Autowired
+    private AgencyService screenCustomerAgencyService;
+
     /**
      * @Description  1、先锋模范
      * @param fineExampleFormDTO
@@ -117,8 +122,14 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) {
+
+        List<String> subAgencyIdorGridIdList=screenCustomerAgencyService.getNextAgencyIds(contactMassLineChartFormDTO.getAreaCode(),contactMassLineChartFormDTO.getAgencyId());
+        log.info("当前组织的下级id:"+JSON.toJSONString(subAgencyIdorGridIdList));
+
         ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO();
-        List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId());
+        // List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId());
+        //多客户版修改如下：
+        List<ContactMassLineChartResult> contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChartByAgencyIds(subAgencyIdorGridIdList);
         if (contactMassLineChartResults.size() == NumConstant.ZERO){
             result.setXAxis(new ArrayList<>());
             result.setGroupMemberData(new ArrayList<>());

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

@@ -272,4 +272,34 @@
             and grid.PARENT_AGENCY_ID=#{agencyId}
     </select>
 
+    <select id="getNextAgencyIds" parameterType="map" resultType="java.lang.String">
+        SELECT
+            sca.AGENCY_ID as   orgId
+        FROM
+            screen_customer_agency sca
+        WHERE
+            sca.DEL_FLAG = '0'
+        <choose>
+            <when test="areaCode != null and areaCode.trim() != ''">
+                AND sca.PARENT_AREA_CODE = #{areaCode}
+            </when>
+            <otherwise>
+                and sca.PID=#{agencyId}
+            </otherwise>
+        </choose>
+        union
+        SELECT
+            m.GRID_ID  as  orgId
+        FROM
+            screen_customer_grid m
+            where m.DEL_FLAG = '0'
+            <choose>
+                <when test="areaCode != null and areaCode.trim() != ''">
+                    and m.AREA_CODE=#{areaCode}
+                </when>
+                <otherwise>
+                    m.PARENT_AGENCY_ID=#{agencyId}
+                </otherwise>
+            </choose>
+    </select>
 </mapper>

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

@@ -19,4 +19,37 @@
             AND md.ORG_TYPE =
             CASE WHEN sca.LEVEL = 'community' THEN 'grid' ELSE 'agency' END
     </select>
+
+    <select id="selectContactMassLineChartByAgencyIds" resultType="com.epmet.evaluationindex.screen.dto.result.ContactMassLineChartResult">
+        SELECT
+            sca.agency_id as orgId,
+            sca.AGENCY_NAME AS orgName,
+            IFNULL(md.create_group_total,0) AS groupTotal,
+            IFNULL(md.group_user_total,0)AS userTotal
+        FROM
+            screen_customer_agency sca
+        LEFT JOIN screen_party_link_masses_data md
+        ON ( sca.agency_id = md.ORG_ID AND	md.del_flag = '0'  )
+        WHERE SCA.DEL_FLAG='0'
+            AND sca.is_display = '1'
+            AND sca.agency_id in
+            <foreach item="agencyId" collection="agencyIdList" open="(" separator="," close=")">
+                #{agencyId}
+            </foreach>
+        union
+        SELECT
+            scg.GRID_ID as orgId,
+            scg.GRID_NAME AS orgName,
+            IFNULL(md.create_group_total,0) AS groupTotal,
+            IFNULL(md.group_user_total,0)AS userTotal
+        FROM
+            screen_customer_grid scg
+        LEFT JOIN screen_party_link_masses_data md
+            ON ( scg.GRID_ID = md.ORG_ID AND md.del_flag = '0'  )
+        WHERE scg.DEL_FLAG='0'
+            AND scg.GRID_ID in
+            <foreach item="agencyId" collection="agencyIdList" open="(" separator="," close=")">
+                #{agencyId}
+            </foreach>
+    </select>
 </mapper>