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

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/BaseEnterpriseVideoServiceImpl.java

@@ -82,6 +82,8 @@ public class BaseEnterpriseVideoServiceImpl extends BaseService<BaseEnterpriseVi
                             commonVideoDto.setType(CommonVideoEnum.getEnum(video.getProtocol()).getName());
                             commonVideoDto.setTitle(channelNo.getTitle());
                             commonVideoDto.setThumb(channelNo.getThumb());
+                            commonVideoDto.setQuality(channelNo.getQuality());
+                            commonVideoDto.setSupportH265(channelNo.getSupportH265());
                             result.add(commonVideoDto);
                         } else {
                             String errorMsg = "code:" + codeVideo + "msg:" + msgVideo + "appKey:" + video.getAppKey() + "appSecret:" + video.getAppSecret() + "accessToken:" + accessToken;

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/AQZSDPStatisticsServiceImpl.java

@@ -427,7 +427,10 @@ public class AQZSDPStatisticsServiceImpl {
         Map<String, Object> dataMap = new HashMap<>();
         List<Object> xdata = new ArrayList<>();
         List<Object> ydata = new ArrayList<>();
-        List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("3");
+        // 不需要统计资质超期和许可超期数据，2024-11-12日需求修改
+        List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("3").stream()
+                .filter(item -> !(item.contains("资质超期") || item.contains("许可超期")))
+                .collect(Collectors.toList());
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode != null) {
             List<CountDto> countDtos = statisticsMapper.selectByOrgAndProblemType(orgCode, enumNameList, dpFilterParamDto, IssueMainBodyEnum.EQUIPMENT.getCode(), null);