外高桥合计

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

@@ -40,6 +40,10 @@ public interface SpStatementShipUsageMonthMapper extends BaseMapper<SpStatementS
     List<SpQuarterReportOriginVo> selectQuarterOrigin(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
 
     List<SpQuarterReportBlVo> selectQuarterBlBerth(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    List<SpStatementShipUsageDetail> selectWgqMonth(@Param("thisDate") Date thisDate, @Param("lastDate") Date lastDate);
+
+    SpStatementShipUsageMonthVo selectWgqYear(@Param("toDate") String dateStrLast);
 }
 
 

src/main/java/com/shcd/scheduling/ShorePowerReportGenerateScheduler.java

@@ -24,6 +24,7 @@ import java.util.Objects;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

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

@@ -170,6 +170,21 @@ public class SpStatementShipUsageMonthServiceImpl extends ServiceImpl<SpStatemen
             sum.setShorePowerTimeMonth(origin.getShorePowerTimeMonth().add(gh.getShorePowerTimeMonth()).add(underLine.getShorePowerTimeMonth()).setScale(2, RoundingMode.HALF_UP));
             sum.setShorePowerTimeYear(origin.getShorePowerTimeYear().add(gh.getShorePowerTimeYear()).add(underLine.getShorePowerTimeYear()).setScale(2, RoundingMode.HALF_UP));
             spStatementShipUsageMonths.add(sum);
+            //傻逼一样的要多算一部分数据，外电1，2，3
+            List<SpStatementShipUsageDetail> sbWgq = spStatementShipUsageMonthMapper.selectWgqMonth(thisDate, lastDate);
+            SpStatementShipUsageMonthVo wgqMonth = makeOriginMonthData(sbWgq);
+            SpStatementShipUsageMonthVo wgqYear = spStatementShipUsageMonthMapper.selectWgqYear(dateStrLast);
+            SpStatementShipUsageMonth wgq = new SpStatementShipUsageMonth();
+            wgq.setId(snowflakeGenerator.next().toString());
+            wgq.setDataSource(100);
+            wgq.setReportDate(DateUtils.stringToDate(thisYear + "-" + thisMonth, "yyyy-MM"));
+            wgq.setShorePowerCountMonth(wgqMonth.getShorePowerCount());
+            wgq.setShipUsageMonth(wgqMonth.getShipUsage());
+            wgq.setShorePowerTimeMonth(wgqMonth.getShorePowerTime());
+            wgq.setShipUsageYear(wgqYear.getShipUsage().add(wgqMonth.getShipUsage()).setScale(2, RoundingMode.HALF_UP));
+            wgq.setShorePowerTimeYear(wgqYear.getShorePowerTime().add(wgqMonth.getShorePowerTime()).setScale(2, RoundingMode.HALF_UP));
+            wgq.setShorePowerCountYear(wgqYear.getShorePowerCount().add(wgqMonth.getShorePowerCount()).setScale(2, RoundingMode.HALF_UP));
+            spStatementShipUsageMonths.add(wgq);
             this.saveBatch(spStatementShipUsageMonths);
             //岸电年比
             ArrayList<SpStatementYearAnalysis> save = new ArrayList<>();

src/main/resources/mapper/SpStatementShipUsageMonthMapper.xml

@@ -64,4 +64,13 @@
         where m.MODIFY_TIME >= #{startDate}
         and  m.MODIFY_TIME <= #{endDate}
     </select>
+    <select id="selectWgqMonth" resultType="com.shcd.vo.SpStatementShipUsageDetail">
+        select STARTTIME chargeStartDate, ENDTIME chargeEndDate ,ELECT shorePowerCount  from GHJG_PORT_MANAGE.SHORE_POWER_CONN_RECORD_INFO
+        where MODIFYTIME between #{lastDate} and #{thisDate} and ENTERPRISESNAME in ('上海外高桥发电有限责任公司','上海外高桥第二发电有限责任公司','上海外高桥第三发电有限责任公司')
+    </select>
+    <select id="selectWgqYear" resultType="com.shcd.vo.SpStatementShipUsageMonthVo">
+        select SHIP_USAGE_YEAR shipUsage, SHORE_POWER_COUNT_YEAR shorePowerCount,SHORE_POWER_TIME_YEAR shorePowerTime
+        from GHJG_PORT_MANAGE.SP_STATEMENT_SHIP_USAGE_MONTH where trunc(REPORT_DATE) = to_date(#{toDate},'yyyy-mm-dd')
+        and DATA_SOURCE = 100
+    </select>
 </mapper>