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

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, @Param("dateId") String dateId);
+	List<CategoryAnalysisResultDTO> selectCategoryAnalysis(@Param("agencyId") String agencyId);
 }

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

@@ -2,7 +2,6 @@ package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventImgDataDao;
@@ -11,9 +10,9 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectDataDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
 import com.epmet.dto.form.screen.CategoryAnalysisFormDTO;
 import com.epmet.dto.result.screen.CategoryAnalysisResultDTO;
+import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO;
@@ -21,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -110,7 +108,6 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
      */
     @Override
     public List<CategoryAnalysisResultDTO> categoryAnalysis(String customerId, CategoryAnalysisFormDTO formDTO) {
-        String dateId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
-        return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId(), dateId);
+        return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId());
     }
 }

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

@@ -6,11 +6,23 @@
 
     <select id="selectCategoryAnalysis" resultType="com.epmet.dto.result.screen.CategoryAnalysisResultDTO">
         SELECT EPMET_CATEGORY_NAME AS categoryName,
-               PROJECT_TOTAL       AS projectTotal
+			 PROJECT_TOTAL  AS projectTotal
         FROM screen_project_category_org_daily
         WHERE DEL_FLAG = '0'
-          AND ORG_ID = #{agencyId}
-          AND DATE_ID = #{dateId}
+            AND ORG_ID = #{agencyId}
+            AND DATE_ID = (
+                select
+                        date_id
+                from
+                        screen_project_category_org_daily
+                where
+                        del_flag = '0'
+                and ORG_ID = #{agencyId}
+                order by
+                        date_id desc,
+                        created_time desc
+                limit 1
+            )
         ORDER BY EPMET_CATEGORY_CODE
     </select>
 </mapper>