Merge remote-tracking branch 'origin/dev'

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

@@ -207,7 +207,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      */
     List<ScreenProjectOrgDailyDTO> selectAgencyByCustomer(@Param("customerId")String customerId);
 
-    List<ScreenProjectOrgDailyDTO> selectAgencyByAreaCode(@Param("customerId") String customerId, @Param("areaCode") String areaCode);
+    List<ScreenProjectOrgDailyDTO> selectAgencyByAreaCode(@Param("areaCode") String areaCode);
 
     /**
      * @Description  根据areaCode查询下级组织

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyDao.java

@@ -49,7 +49,6 @@ public interface ScreenProjectQuantityOrgMonthlyDao extends BaseDao<ScreenProjec
 	 * @date 2021/2/2 上午11:09
 	 */
 	List<ProjectOrgMonthlyResultDTO> selectQuantityOrgMonthly(
-			@Param("customerId") String customerId,
 			@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos,
 			@Param("monthId") String monthId);
 	List<ProjectOrgMonthlyResultDTO> selectQuantityOrgMonthlyByAgency(@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos, @Param("monthId") String monthId);
@@ -62,7 +61,6 @@ public interface ScreenProjectQuantityOrgMonthlyDao extends BaseDao<ScreenProjec
 	 * @date 2021/2/2 下午3:03
 	 */
 	List<ProjectOrgMonthlyResultDTO> selectQuantityGrandOrgMonthly(
-			@Param("customerId") String customerId,
 			@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos,
 			@Param("monthId") String monthId);
 	List<ProjectOrgMonthlyResultDTO> selectQuantityGrandOrgMonthlyByAgency(@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos, @Param("monthId") String monthId);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java

@@ -220,7 +220,7 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
      */
     public void extractionProjectOrgDailyMoreCustomer(String customerId, String dateId){
         CustomerAgencyEntity rootAgency=customerAgencyService.getRootAgencyInfo(customerId);
-        List<ScreenProjectOrgDailyDTO> agencyInfos = agencyDao.selectAgencyByAreaCode(null, rootAgency.getAreaCode());
+        List<ScreenProjectOrgDailyDTO> agencyInfos = agencyDao.selectAgencyByAreaCode(rootAgency.getAreaCode());
         if (CollectionUtils.isEmpty(agencyInfos)){
             log.warn(String.format(PingYinConstants.AGENCY_INFO_IS_ZERO,customerId));
             return;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -188,7 +188,7 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
                 p.setProjectIncr(p.getProjectIncr());
             });
         }
-        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(null, agencyInfos, monthId);
+        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(agencyInfos, monthId);
         if (!CollectionUtils.isEmpty(projectGrandOrg)){
             projectGrandOrg.forEach(p -> {
                 p.setClosedTotal(p.getClosedTotal());
@@ -245,21 +245,21 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
      */
     public void extractionProjectOrgMonthlyMoreCustomer(String customerId,String monthId){
         CustomerAgencyEntity rootAgency=customerAgencyService.getRootAgencyInfo(customerId);
-        List<ScreenProjectOrgDailyDTO> screenProjectOrgDailyDTOS=agencyDao.selectAgencyByAreaCode(customerId, rootAgency.getAreaCode());
+        List<ScreenProjectOrgDailyDTO> screenProjectOrgDailyDTOS=agencyDao.selectAgencyByAreaCode(rootAgency.getAreaCode());
         if (CollectionUtils.isEmpty(screenProjectOrgDailyDTOS)){
             log.warn(String.format(PingYinConstants.AGENCY_INFO_IS_ZERO,customerId));
             return;
         }
 
         List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos = ConvertUtils.sourceToTarget(screenProjectOrgDailyDTOS, ScreenProjectQuantityOrgMonthlyDTO.class);
-        List<ProjectOrgMonthlyResultDTO> projectOrg = baseDao.selectQuantityOrgMonthly(customerId, agencyInfos, monthId);
+        List<ProjectOrgMonthlyResultDTO> projectOrg = baseDao.selectQuantityOrgMonthly(agencyInfos, monthId);
         /*if (!CollectionUtils.isEmpty(projectOrg)){
             projectOrg.forEach(p -> {
                 p.setClosedIncr(p.getClosedIncr());
                 p.setProjectIncr(p.getProjectIncr());
             });
         }*/
-        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(customerId, agencyInfos, monthId);
+        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(agencyInfos, monthId);
         /*if (!CollectionUtils.isEmpty(projectGrandOrg)){
             projectGrandOrg.forEach(p -> {
                 p.setClosedTotal(p.getClosedTotal());

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

@@ -391,7 +391,6 @@
         FROM screen_customer_agency sca
         WHERE DEL_FLAG = 0
         and sca.AREA_CODE like CONCAT(#{areaCode},'%')
-        AND sca.customer_id = #{customerId}
     </select>
 
     <!-- 根据areaCode查询下级组织 -->

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyDao.xml

@@ -108,7 +108,6 @@
             WHERE g.DEL_FLAG = 0
             AND cg.AREA_CODE LIKE CONCAT(#{a.areaCode},'%')
             AND g.MONTH_ID = #{monthId}
-            AND g.CUSTOMER_ID = #{customerId}
         </foreach>
     </select>