Jelajahi Sumber

查询公共询价排序更新,按id,时间进行排序

hejq 7 tahun lalu
induk
melakukan
7f9120ec8c

+ 1 - 1
src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -192,7 +192,7 @@ public class PublicInquiryController {
     @HttpLog
     @RequestMapping(method = RequestMethod.GET)
     public IPage<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
-        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        Sort sort = new Sort(Sort.Direction.DESC, "id", "date");
         if (pageInfo.getOffset() == 0) {
             pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
         }

+ 5 - 4
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -147,17 +147,18 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     @Override
     public void save(List<BatchInquiry> inquiries, Long enuu, String address) throws NotFoundException {
         List<PurcInquiry> purcInquiries = covert(inquiries, enuu, address);
-        if(!CollectionUtils.isEmpty(purcInquiries)) {
-            for(PurcInquiry inquiry : purcInquiries) {
+        if (!CollectionUtils.isEmpty(purcInquiries)) {
+            for (PurcInquiry inquiry : purcInquiries) {
                 // 判断单号是否已存在
                 PurcInquiry old = purcInquiryDao.findByCodeAndEnUU(inquiry.getCode(), enuu);
                 List<PurcInquiryItem> items = new ArrayList<PurcInquiryItem>();
-                if(old == null && !CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
-                    for(PurcInquiryItem item : inquiry.getInquiryItems()) {
+                if (old == null && !CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
+                    for (PurcInquiryItem item : inquiry.getInquiryItems()) {
                         item.setInquiry(inquiry);
                         items.add(item);
                     }
                 }
+                System.out.println(items.size());
                 try {
                     items = purcInquiryItemDao.save(items);
                     if (!CollectionUtils.isEmpty(items)) {