空值判断

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

@@ -224,10 +224,10 @@ public class ShorePowerScheduler {
   private SpStatementShipUsageMonthService spStatementShipUsageMonthService;
 
   //@Scheduled(cron = "")
-  @PostConstruct
-  public void makeShangHaiShorePowerUsageRecord() {
-    spStatementShipUsageMonthService.makeShangHaiShorePowerUsageRecord();
-  }
+//  @PostConstruct
+//  public void makeShangHaiShorePowerUsageRecord() {
+//    spStatementShipUsageMonthService.makeShangHaiShorePowerUsageRecord();
+//  }
 
   @XxlJob("connectorStatusInfo")
   public ReturnT<String> getConnectorStatusInfo(String params) {

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

@@ -174,6 +174,9 @@ public class SpStatementShipUsageMonthServiceImpl extends ServiceImpl<SpStatemen
             List<SpStatementShipUsageDetail> sbWgq = spStatementShipUsageMonthMapper.selectWgqMonth(thisDate, lastDate);
             SpStatementShipUsageMonthVo wgqMonth = makeOriginMonthData(sbWgq);
             SpStatementShipUsageMonthVo wgqYear = spStatementShipUsageMonthMapper.selectWgqYear(dateStrLast);
+            if (wgqYear == null){
+                wgqYear = new SpStatementShipUsageMonthVo();
+            }
             SpStatementShipUsageMonth wgq = new SpStatementShipUsageMonth();
             wgq.setId(snowflakeGenerator.next().toString());
             wgq.setDataSource(100);

src/main/resources/mapper/SpStatementShipUsageMonthMapper.xml

@@ -43,7 +43,7 @@
     </select>
     <select id="selectOriginSelfDataMonth" resultType="com.shcd.vo.SpStatementShipUsageMonthVo">
         select  sum(USE_COUNT) shipUsage, sum(ELE_TIME) shorePowerCount, sum(USE_ELECTRICITY) shorePowerTime from GHJG_PORT_MANAGE.Shore_Power_Blberthmonthuse
-        where MODIFY_TIME >= #{thisDate} and MODIFY_TIME &lt;= #{lastDate}
+        where MODIFY_TIME >= #{lastDate} and MODIFY_TIME &lt;= #{thisDate}
     </select>
     <select id="selectOriginSelfDataYear" resultType="com.shcd.vo.SpStatementShipUsageMonthVo">
         select  sum(USE_COUNT) shipUsage, sum(ELE_TIME) shorePowerCount, sum(USE_ELECTRICITY) shorePowerTime from GHJG_PORT_MANAGE.Shore_Power_Blberthmonthuse