新版430
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zenglf
2023-10-24 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb 
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentAlarmAnalyzeServiceImpl.java


@@ -125,7 +125,9 @@


                mdcAlarmDto.setKey(equipmentId);


                Integer count = mdcEquipmentRunningSectionService.findAlarmCount(equipmentId, startDate, endDate, vo.getAlarmCode());


                mdcAlarmDto.setCount(count);


                equipmentCountList.add(mdcAlarmDto);


                if (count != 0) {


                    equipmentCountList.add(mdcAlarmDto);


                }


            }


            result.setEquipmentCountList(equipmentCountList);


        }


@@ -139,8 +141,8 @@


        for (String date : datesStringList) {


            MdcAlarmDto mdcAlarmDto = new MdcAlarmDto();


            mdcAlarmDto.setKey(DateUtils.format(DateUtils.toDate(date, DateUtils.STR_DATE), DateUtils.STR_MMDD));


            String startDate = DateUtils.format(DateUtils.toDate(date, DateUtils.STRDATE), DateUtils.STR_DATE) + " 00:00:00";


            String endDate = DateUtils.format(DateUtils.addDays(DateUtils.toDate(date, DateUtils.STRDATE), 1), DateUtils.STR_DATE) + " 00:00:00";


            String startDate = date + " 00:00:00";


            String endDate = DateUtils.format(DateUtils.addDays(DateUtils.toDate(date, DateUtils.STR_DATE), 1), DateUtils.STR_DATE) + " 00:00:00";


            Integer count = mdcEquipmentRunningSectionService.findAlarmCountByDate(startDate, endDate, vo);


            mdcAlarmDto.setCount(count);


            dateCountList.add(mdcAlarmDto);