Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyage/VoyageMapper.java

@@ -47,7 +47,7 @@ public interface VoyageMapper extends BaseMapperX<VoyageDO> {
                 .eqIfPresent(VoyageDO::getRouteId, reqVO.getRouteId())
                 .eq(VoyageDO::getShelfStatus, VoyageShelfStatusEnum.ON_SHELF.getValue())
                 .likeIfPresent(VoyageDO::getChannel, reqVO.getChannel())
-                .orderByAsc(VoyageDO::getCreateTime));
+                .orderByAsc(VoyageDO::getStartTime));
     }
 
     default List<VoyageDO> selectOnShelfListByShipId(Long shipId) {
@@ -56,7 +56,7 @@ public interface VoyageMapper extends BaseMapperX<VoyageDO> {
                 .gt(VoyageDO::getStartTime, LocalDate.now())
                 .eq(VoyageDO::getShelfStatus, VoyageShelfStatusEnum.ON_SHELF.getValue())
                 .like(VoyageDO::getChannel, "1")
-                .orderByAsc(VoyageDO::getCreateTime));
+                .orderByAsc(VoyageDO::getStartTime));
     }
 
     List<VoyageDO> selectVovageList(@Param("shipId") Long shipId);

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestock/VoyageStockMapper.java

@@ -38,7 +38,7 @@ public interface VoyageStockMapper extends BaseMapperX<VoyageStockDO> {
                 .eqIfPresent(VoyageStockDO::getShipId, reqVO.getShipId())
                 .inIfPresent(VoyageStockDO::getVoyageId, reqVO.getVoyageIds())
                 .betweenIfPresent(VoyageDO::getStartTime, reqVO.getVoyageTime()[0], reqVO.getVoyageTime()[1])
-                .orderByDesc(VoyageStockDO::getVoyageId);
+                .orderByAsc(VoyageDO::getStartTime);
         return selectJoinPage(reqVO, VoyageStockDO.class, wrapperX);
     }
 

ship-module-product/ship-module-product-biz/src/main/resources/mapper/voyage/VoyageMapper.xml

@@ -33,5 +33,6 @@
               and w.start_time <= CONCAT(#{date},' 23:59:59')
           </if>
          and w.shelf_status = 1
+        order by w.start_time asc
     </select>
 </mapper>