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

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

@@ -55,6 +55,7 @@ public interface ScreenProjectDataDao {
      * @date 2021/11/5 1:40 下午
      */
     List<CategoryProjectListResultDTO> selectCategoryProjectList(@Param("customerId") String customerId,@Param("orgId") String orgId,
-                                                                 @Param("categoryCode")String categoryCode,@Param("status")String status);
+                                                                 @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

@@ -382,7 +382,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()));
+                .doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), 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,6 +180,10 @@
           AND CONCAT(ALL_PARENT_IDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%')
           AND CATEGORY_CODE LIKE CONCAT('%',#{categoryCode},'%')
           AND CUSTOMER_ID = #{customerId}
+          AND DATE_FORMAT(PROJECT_CREATE_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
+          <if test="null != startTime and startTime != '' ">
+              AND DATE_FORMAT(PROJECT_CREATE_TIME,'%Y%m%d') >= #{startTime}
+          </if>
         ORDER BY PROJECT_CREATE_TIME DESC
     </select>
 </mapper>