1 year ago
parent
commit
23529a5540

+ 0 - 1
platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseDetailMapper.xml

@@ -98,6 +98,5 @@
         </where>
         </where>
 GROUP BY spare_id
 GROUP BY spare_id
 ORDER BY totalNum DESC
 ORDER BY totalNum DESC
-LIMIT 50
     </select>
     </select>
 </mapper>
 </mapper>

+ 1 - 0
platform-rest/src/main/resources/application-dev.yml

@@ -87,6 +87,7 @@ ignore:
     - /sb/measure-logs/**
     - /sb/measure-logs/**
     - /sb/positions/**
     - /sb/positions/**
     - /preparation/preparations/**
     - /preparation/preparations/**
+    - /longyanpurchaseorder/detail/**
 platform:
 platform:
   slf4j:
   slf4j:
     data: D://xajg
     data: D://xajg

+ 14 - 1
platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseDetailServiceImpl.java

@@ -15,6 +15,7 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -31,7 +32,19 @@ public class LongYanPurchaseDetailServiceImpl extends BaseServiceImpl<LongYanPur
     public AbstractPageResultBean<SpareChartsFifityVO> getSpareNumChartsFifity(LongYanPurchaseDetailDTO detailDTO, Integer pageNum, Integer pageSize) {
     public AbstractPageResultBean<SpareChartsFifityVO> getSpareNumChartsFifity(LongYanPurchaseDetailDTO detailDTO, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum,pageSize);
         PageHelper.startPage(pageNum,pageSize);
         List<SpareChartsFifityVO> list = mapper.getSpareNumChartsFifity(detailDTO);
         List<SpareChartsFifityVO> list = mapper.getSpareNumChartsFifity(detailDTO);
-        return new MyPage<>(list);
+        List<SpareChartsFifityVO> finalList = new ArrayList<>();
+        if (list!=null){
+            if (list.size()>50){
+                for (int i = 0;i<50;i++){
+                    finalList.add(list.get(i));
+                }
+                return new MyPage<>(finalList);
+            }else {
+                return new MyPage<>(list);
+            }
+        }
+        return new MyPage(list);
+
     }
     }
 
 
     @Override
     @Override