修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/GrainDeliveryRegistrationServiceImpl.java

@@ -107,7 +107,7 @@ public class GrainDeliveryRegistrationServiceImpl extends ServiceImpl<GrainDeliv
         List<GrainDeliveryRegistration> grainDeliveryRegistrationList = this.selectList(new EntityWrapper<GrainDeliveryRegistration>()
             .eq("common_id",commonId)
             .eq("delete_flag","0")
-            .orderBy("create_date"));
+            .orderBy("validity_date", false));
         if (!CollectionUtils.isEmpty(grainDeliveryRegistrationList)){
             for (GrainDeliveryRegistration grainDeliveryRegistration : grainDeliveryRegistrationList){
                 //查询送货信息
@@ -116,6 +116,7 @@ public class GrainDeliveryRegistrationServiceImpl extends ServiceImpl<GrainDeliv
                         .eq("delete_flag","0"));
                 if (!CollectionUtils.isEmpty(shippingInformations)) {
                     grainDeliveryRegistration.setShippingInformationList(shippingInformations);
+                    grainDeliveryRegistration.setCreateDate(shippingInformations.get(0).getCreateDate());
                 }
             }
         }