Merge remote-tracking branch 'origin/dev'

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

@@ -38,5 +38,5 @@ public interface ScreenProjectCategoryOrgDailyDao {
 	 * @param agencyId
 	 * @return java.util.List<com.epmet.dto.result.screen.CategoryAnalysisResultDTO>
 	 */
-	List<CategoryAnalysisResultDTO> selectCategoryAnalysis(@Param("agencyId") String agencyId);
+	List<CategoryAnalysisResultDTO> selectCategoryAnalysis(@Param("agencyId") String agencyId,@Param("customerId")String customerId);
 }

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

@@ -112,6 +112,6 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     public List<CategoryAnalysisResultDTO> categoryAnalysis(String customerId, CategoryAnalysisFormDTO formDTO) {
-        return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId());
+        return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId(),customerId);
     }
 }

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

@@ -9,22 +9,26 @@
 			 M.PROJECT_TOTAL  AS projectTotal
         FROM screen_project_category_org_daily m
         left join customer_project_category_dict d
-            on(m.CATEGORY_CODE=D.CATEGORY_CODE AND D.DEL_FLAG='0')
+         on(m.CATEGORY_CODE=D.CATEGORY_CODE
+                AND D.DEL_FLAG='0'
+                and d.CUSTOMER_ID=#{customerId})
         WHERE M.DEL_FLAG = '0'
-                AND M.ORG_ID = #{agencyId}
+                    AND M.ORG_ID = #{agencyId}
-                AND M.DATE_ID = (
+                    AND M.DATE_ID = (
-                        select
+                                    select
-                            date_id
+                                            date_id
-                        from
+                                    from
-                            screen_project_category_org_daily
+                                            screen_project_category_org_daily
-                        where
+                                    where
-                            del_flag = '0'
+                                            del_flag = '0'
-                        and ORG_ID = #{agencyId}
+                                    and ORG_ID = #{agencyId}
-                        order by
+                                    and CUSTOMER_ID=#{customerId}
-                            date_id desc,
+                                    order by
-                            created_time desc
+                                            date_id desc,
-                        limit 1
+                                            created_time desc
-                )
+                                    limit 1
-        ORDER BY M.CATEGORY_CODE ASC
+                    )
+        ORDER BY M.PROJECT_TOTAL desc,D.CATEGORY_NAME asc
+        limit 20
     </select>
 </mapper>