Merge branch 'dev-temp-xw-202502170000-45112' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java

@@ -142,7 +142,7 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getPublishTimeStart()) && !StringUtils.isEmpty(model.getPublishTimeEnd())) {
             commonQueryHql.append("AND ms.publishTime between :publishTimeStart and :publishTimeEnd ");
         }
-        if (!StringUtils.isEmpty(model.getPlanArriveEndTime()) && !StringUtils.isEmpty(model.getPlanArriveEndTime())) {
+        if (!StringUtils.isEmpty(model.getPlanArriveEndTimeStart()) && !StringUtils.isEmpty(model.getPlanArriveEndTimeEnd())) {
             commonQueryHql.append("AND ms.planArriveEndTime between :planArriveEndTimeStart and :planArriveEndTimeEnd ");
         }