Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

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

@@ -55,16 +55,28 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	List<CategoryProjectResultDTO> selectOrgCategoryInfo(@Param("customerId") String customerId, @Param("dateId") String dateId,@Param("level")String level);
 
 	/**
-	 * @Description  查询组织分类信息【多客户】
+	 * @Description  查询组织分类信息【多客户】父客户存在的分类
 	 * @Param customerId
 	 * @Param dateId
 	 * @Param level
-	 * @Param existsStatus 父客户是否存在
 	 * @author zxc
 	 * @date 2021/3/24 下午2:48
 	 */
 	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfo(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
-																	 @Param("level")String level, @Param("customerId")String customerId, @Param("existsStatus")Boolean existsStatus);
+																	 @Param("level")String level, @Param("customerId")String customerId);
+
+	/**
+	 * @Description  查询组织分类信息【多客户】父客户存在的分类
+	 * @param customerIds
+	 * @param dateId
+	 * @param level
+	 * @param customerId
+	 * @author zxc
+	 * @date 2021/10/21 4:03 下午
+	 */
+	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfoNotExists(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
+																	 @Param("level")String level, @Param("customerId")String customerId);
+
 	/**
 	 * @Description  查询组织分类信息【多客户】升级版
 	 * @Param customerIds

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java

@@ -197,7 +197,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 			}
 		}
 
-		log.error(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", param.getCustomerId()));
+		log.warn(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", param.getCustomerId()));
 	}
 
 	/**

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

@@ -415,10 +415,10 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 // 子客户单独存一份【三个街道的】
                 List<CategoryProjectResultDTO> sonCustomerList = new ArrayList<>();
                 // 父客户存在的分类
-                List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, true);
+                List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId);
                 log.info("父客户存在的分类{}"+ JSON.toJSONString(categoryProjectExists));
                 // 父客户不存在的分类
-                List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, false);
+                List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfoNotExists(customerIds, dateId, level, customerId);
                 log.info("父客户不存在的分类{}"+ JSON.toJSONString(categoryProjectNotExists));
                 if (!CollectionUtils.isEmpty(categoryProjectExists)){
                     sonCustomerList.addAll(categoryProjectExists);

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

@@ -44,7 +44,7 @@
         GROUP BY sa.CATEGORY_CODE,sca.AGENCY_ID
     </select>
 
-    <!-- 查询组织分类信息【多客户】 -->
+    <!-- 查询组织分类信息【多客户】 父客户存在的分类-->
     <select id="selectOrgCategoryMoreCustomerInfo" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
         SELECT
             od.ORG_ID AS orgId,
@@ -52,18 +52,13 @@
             IFNULL(sca.PIDS,'0') AS pids,
             #{customerId} as customerId,
             od.CUSTOMER_ID AS categoryOriginCustomerId,
-            od.level,
-            <if test="existsStatus == true">
-                cd.EPMET_CATEGORY_CODE AS categoryCode,
-            </if>
-            <if test="existsStatus == false">
-                od.CATEGORY_CODE AS categoryCode,
-            </if>
+            cd.level,
+            cd.EPMET_CATEGORY_CODE AS categoryCode,
             SUM(od.PROJECT_TOTAL) AS projectTotal,
             #{level} as orgType,
             od.DATE_ID
         FROM screen_project_category_org_daily od
-        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = od.CUSTOMER_ID)
+        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = #{customerId})
         LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.ORG_ID
         WHERE 1=1
           AND od.DEL_FLAG = '0'
@@ -72,13 +67,8 @@
               od.CUSTOMER_ID = #{id}
           </foreach>
                   )
-          <if test="existsStatus == true">
-              AND cd.EPMET_CATEGORY_CODE IS NOT NULL
-              AND cd.EPMET_CATEGORY_CODE != ''
-          </if>
-          <if test="existsStatus == false">
-              AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
-          </if>
+          AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+          AND cd.EPMET_CATEGORY_CODE != ''
           AND od.pid = '0'
           AND od.date_id = #{dateId}
         GROUP BY categoryCode,od.ORG_ID
@@ -163,4 +153,33 @@
         GROUP BY od.CATEGORY_CODE,od.pid
     </select>
 
+    <!-- 查询组织分类信息【多客户】 父客户不存在的分类-->
+    <select id="selectOrgCategoryMoreCustomerInfoNotExists" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
+        SELECT
+        od.ORG_ID AS orgId,
+        IFNULL(sca.PID,'0') AS pid,
+        IFNULL(sca.PIDS,'0') AS pids,
+        #{customerId} as customerId,
+        od.CUSTOMER_ID AS categoryOriginCustomerId,
+        od.level,
+        od.CATEGORY_CODE AS categoryCode,
+        SUM(od.PROJECT_TOTAL) AS projectTotal,
+        #{level} as orgType,
+        od.DATE_ID
+        FROM screen_project_category_org_daily od
+        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = od.CUSTOMER_ID)
+        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.ORG_ID
+        WHERE 1=1
+        AND od.DEL_FLAG = '0'
+        AND (
+        <foreach collection="customerIds" item="id" separator=" OR ">
+            od.CUSTOMER_ID = #{id}
+        </foreach>
+        )
+        AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
+        AND od.pid = '0'
+        AND od.date_id = #{dateId}
+        GROUP BY categoryCode,od.ORG_ID
+    </select>
+
 </mapper>