:bug: 长江经济带报表/季度报表bug修复

src/main/java/com/shcd/mapper/SpStatementShipUsageMonthMapper.java

@@ -43,9 +43,9 @@ public interface SpStatementShipUsageMonthMapper extends BaseMapper<SpStatementS
   SpStatementShipUsageMonthVo selectOriginSelfDataYear(@Param("yearCountBegin") Date yearCountBegin,
       @Param("yearCountEnd") Date yearCountEnd);
 
-  List<SpQuarterReportOriginVo> selectQuarterOrigin(@Param("newStartDate") Date newStartDate,
-      @Param("newStartEnd") Date date, @Param("startDate") Date startDate,
-      @Param("endDate") Date endDate);
+  List<SpQuarterReportOriginVo> selectQuarterOrigin(@Param("startDate") Date startDate,
+      @Param("endDate") Date endDate, @Param("newStartDate") Date newStartDate,
+      @Param("newStartEnd") Date newStartEnd);
 
   List<SpQuarterReportBlVo> selectQuarterBlBerth(@Param("startDate") Date startDate,
       @Param("endDate") Date endDate);

src/main/java/com/shcd/service/impl/SpStatementShipUsageMonthServiceImpl.java

@@ -210,7 +210,7 @@ public class SpStatementShipUsageMonthServiceImpl extends
           origin.getShipUsageMonth().add(gh.getShipUsageMonth()).add(underLine.getShipUsageMonth())
               .setScale(2, RoundingMode.HALF_UP));
       sum.setShipUsageYear(
-          origin.getShipUsageYear().add(gh.getShipUsageYear()).add(underLine.getShipUsageMonth())
+          origin.getShipUsageYear().add(gh.getShipUsageYear()).add(underLine.getShipUsageYear())
               .setScale(2, RoundingMode.HALF_UP));
       sum.setShorePowerCountMonth(origin.getShorePowerCountMonth().add(gh.getShorePowerCountMonth())
           .add(underLine.getShorePowerCountMonth()).setScale(2, RoundingMode.HALF_UP));

src/main/resources/mapper/SpStatementShipUsageMonthMapper.xml

@@ -57,11 +57,11 @@
       select b.BERTHTYPE, b.CAPACITY, i.STARTTIME, i.ENDTIME, i.ELECT
       from GHJG_PORT_MANAGE.SHORE_POWER_CONN_RECORD_INFO i
              left join GHJG_PORT_MANAGE.SHORE_POWER_BERTH_INFO_NEW b on i.BERTHID = b.BERTHID
-      where (i.STARTTIME >= #{startDate}
-        and i.STARTTIME <= #{endDate})
+      where b.BERTHTYPE is not null
+        AND ((i.STARTTIME >= #{startDate}
+        AND i.STARTTIME <= #{endDate})
         OR (i.STARTTIME >= #{newStartDate} and i.STARTTIME <= #{newStartEnd} AND
-             i.MODIFYTIME >= #{startDate} and i.MODIFYTIME <= #{endDate})
-        AND b.BERTHTYPE is not null
+            i.MODIFYTIME >= #{startDate} and i.MODIFYTIME <= #{endDate}))
     </select>
     <select id="selectQuarterBlBerth" resultType="com.shcd.vo.SpQuarterReportBlVo">
         select B.BERTH_TYPE berthType, b.TONNAGE capacity , m.USE_COUNT useCount, m.ELE_TIME elect, m.USE_ELECTRICITY useElectricity