提交代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -339,6 +339,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         hygf_preparation_money hpm
         LEFT JOIN hygf_document_station hds ON hds.preparation_money_id=hpm.sequence_nbr
         <where>
+            AND  hds.station_id IS NOT NULL
             <if test="list != null and list.size()>0">
                 AND hds.station_id IN
                 <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationStatisticsServiceImpl.java

@@ -47,9 +47,9 @@ public class PowerStationStatisticsServiceImpl {
     private void addPowerStationTime(List<PowerStationTimeStatisticsDto> statisticsDtos) {
         if (CollectionUtil.isNotEmpty(statisticsDtos)) {
             List<Long> sequenceNbrList = new ArrayList<>();
-            for (PowerStationTimeStatisticsDto statisticsDto : statisticsDtos) {
-                sequenceNbrList.add(statisticsDto.getSequenceNbr());
-            }
+//            for (PowerStationTimeStatisticsDto statisticsDto : statisticsDtos) {
+//                sequenceNbrList.add(statisticsDto.getSequenceNbr());
+//            }
             Map<Long, List<PowerStationTimeStatisticsDto>> kcMap = getKcTime(sequenceNbrList);
             Map<Long, List<PowerStationTimeStatisticsDto>> dzhtqyMap = getDzhtqyTime(sequenceNbrList);
             Map<Long, List<PowerStationTimeStatisticsDto>> sjMap = getSjTime(sequenceNbrList);