航次利润 增加开船日期 取值 实际开船日期 倒叙排列实际开船日期

ruoyi-warehouse/src/main/java/com/ruoyi/finance/shipping/ProfitExcel.java

@@ -24,6 +24,11 @@ public class ProfitExcel implements Serializable {
     @Excel(name = "航次")
     private String voyage;
     /**
+     *实际开船日期
+     */
+    @Excel(name = "开船日期")
+    private Date atd;
+    /**
      *应收合计
      */
     @Excel(name = "应收合计")
@@ -65,6 +70,10 @@ public class ProfitExcel implements Serializable {
         this.voyage = voyage;
     }
 
+    public Date getAtd() {return atd;}
+
+    public void setAtd(Date atd){this.atd = atd;}
+
     public BigDecimal getReceivable() {
         return receivable;
     }
@@ -110,6 +119,7 @@ public class ProfitExcel implements Serializable {
         return "ProfitExcel{" +
                 "shipsName='" + shipsName + '\'' +
                 ", voyage='" + voyage + '\'' +
+                ", atd=" + atd +
                 ", receivable=" + receivable +
                 ", handle=" + handle +
                 ", profit=" + profit +

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -1799,6 +1799,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
     /**
      * 导出仓储明细
+     * SJRK  实际入库
+     * CKDB  仓库调拨
+     * HQZY  货权转移
+     * SJCK  实际出库
      */
     @Override
     public List<StorageDetail> selectStorageDetail(Long fId) {

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2548,6 +2548,7 @@
         DISTINCT
         tv.f_name AS shipsName,
         ty.f_no AS voyage,
+        ty.f_atd AS atd,
         ROUND(sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ),2) AS receivable,
         ROUND(sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END ),2) AS handle,
         ROUND((sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) - sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END )),2) AS profit,
@@ -2583,8 +2584,8 @@
             <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
                 and ty.f_ATD &lt;= #{timeInterval[1]}
             </if>
-            GROUP BY tw.f_vslid,tw.f_voyid
-            ORDER BY tw.f_bsdate DESC
+            GROUP BY tw.f_vslid,tw.f_voyid,ty.f_atd
+            ORDER BY ty.f_atd DESC
         </where>
     </select>
     <select id="handle" resultType="com.ruoyi.finance.shipping.HandleExcel">