修改

src/main/java/com/steerinfo/dil/service/impl/BmsportHandlingFeeServiceImpl.java

@@ -367,9 +367,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         bmsshipStatement.setStatementNo("BMSSF"+new Date().getTime());
         bmsshipStatement.setStatementStatus(DataChange.dataToBigDecimal(map.get("statementStatus")));
         bmsshipStatement.setInsertTime(new Date());
-        if(bmsshipStatement.getStatementStatus().intValue()==1){
-            bmsshipStatement.setUpdateTime(new Date());//结算日期
-        }
+        bmsshipStatement.setUpdateTime(new Date());//结算日期
         //新增
         return bmsshipStatementMapper.insertSelective(bmsshipStatement);
     }

src/main/resources/com/steerinfo/dil/mapper/BmsportHandlingFeeMapper.xml

@@ -728,7 +728,7 @@
         LEFT JOIN
         (SELECT DISTINCT
         TWQR.UNIT_PRICE_ID "unitPriceId",
-        DB.BATCH_ID "batchId"
+        tlsr.BATCH_ID "batchId"
         FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
         LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
         ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
@@ -741,7 +741,7 @@
         LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
         ON ADN.BATCH_ID=tlsr.BATCH_ID
         where TLSR.DELETED=0 AND ADN.DELETED=0) BU
-        ON BU."batchId"=DB.BATCH_ID
+        ON BU."batchId"=ADN.BATCH_ID
         LEFT JOIN BMSSHIP_CONTRACT_PRICE BCR
         ON BU."unitPriceId"=BCR.RESULT_ID
         LEFT JOIN RMS_PORT	rp
@@ -851,7 +851,7 @@
         ON ADN.BATCH_ID=tlsr.BATCH_ID
         where TLSR.DELETED=0 AND ADN.DELETED=0
         GROUP BY dbi.BATCH_ID,TWQR.UNIT_PRICE_ID)
-        LTT ON BU."batchId" = LTT."batchId" and BU."unitPriceId"=LTT."unitPriceId" --批次和单价的月份装船吨位，用于计算月份装船比例
+        LTT ON DB.BATCH_ID = LTT."batchId" and BU."unitPriceId"=LTT."unitPriceId" --批次和单价的月份装船吨位，用于计算月份装船比例
         WHERE adn.DELETED=0 AND ada.DELETED=0  AND APO.DELETED=0
         and (BS.STATEMENT_ID is null or BS.STATEMENT_STATUS=0)
         <if test="con!=null and con!=''.toString()">