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

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

@@ -54,7 +54,7 @@ public interface ScreenProjectDataDao {
      * @author zxc
      * @date 2021/11/5 1:40 下午
      */
-    List<CategoryProjectListResultDTO> selectCategoryProjectList(@Param("customerId") String customerId,@Param("orgId") String orgId,
+    List<CategoryProjectListResultDTO> selectCategoryProjectList(@Param("orgId") String orgId,
                                                                  @Param("categoryCode")String categoryCode,@Param("status")String status,
                                                                  @Param("startTime")String startTime,@Param("endTime")String endTime);
 

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

@@ -11,6 +11,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.FactConstant;
@@ -253,6 +254,9 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
      */
     @Override
     public List<ProjectCategoryResultDTO> selectProjectCategory(ProjectCategoryFormDTO formDTO, TokenDto tokenDto) {
+        if (StringUtils.isNotBlank(formDTO.getStartTime())){
+            formDTO.setStartTime(DateUtils.getBeforeNDay(formDTO.getStartTime(),NumConstant.ONE));
+        }
         if (StringUtils.isBlank(formDTO.getOrgId())){
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
             if (null == staffInfo){
@@ -382,7 +386,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         PageCategoryProjectListResultDTO result = new PageCategoryProjectListResultDTO();
         List<CategoryProjectListResultDTO> list;
         PageInfo<CategoryProjectListResultDTO> objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage())
-                .doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus(),formDTO.getStartTime(),formDTO.getEndTime()));
+                .doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus(),formDTO.getStartTime(),formDTO.getEndTime()));
         list = objectPageInfo.getList();
         result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal())));
 

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

@@ -180,7 +180,6 @@
             </if>
             AND CONCAT(pd.ALL_PARENT_IDS,':',pd.ORG_ID) LIKE CONCAT('%',#{orgId},'%')
             AND pc.CATEGORY_CODE LIKE CONCAT(#{categoryCode},'%')
-            AND pd.CUSTOMER_ID = #{customerId}
             AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
             <if test="null != startTime and startTime != '' ">
                 AND DATE_FORMAT(pd.PROJECT_CREATE_TIME,'%Y%m%d') >= #{startTime}