Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Digital-Investment

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanPushVo.java

@@ -17,6 +17,7 @@ public class PlanPushVo {
     private String goodsIntroduce;
     private Float goodsPrice;
     private String goodsClassify;
+    private Integer sort;
 
     public PlanPushVo(){}
     public PlanPushVo(PlanItem item, Plan plan){
@@ -30,5 +31,6 @@ public class PlanPushVo {
         this.goodsPrice = plan.getGoodsPrice();
         this.goodsIntroduce = plan.getGoodsIntroduce();
         this.goodsClassify = plan.getGoodsClassify();
+        this.sort = item.getSort();
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -267,6 +268,7 @@ public class PlanServiceImpl implements PlanService {
         itemQueryWrapper.eq("equipment_code",equipmentCode);
         itemQueryWrapper.eq("deleted","0");
         List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
+        items.sort(Comparator.comparing(PlanItem::getSort).reversed());
         for (PlanItem item : items){
             QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
             planQueryWrapper.eq("plan_id",item.getPlanId());