增加日期过滤排序

src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -31,12 +31,12 @@ public class InquiryForSaleController {
     /**
      * 通过ID查询报价详情
      *
-     * @param id 已转报价的明细id
+     * @param itemId 已转报价的明细id
      * @return
      */
     @RequestMapping(value = "/inquiry/detail", method = RequestMethod.GET)
-    public PublicInquiryItem findById(Long id, Long enuu) {
-        return saleService.findById(id);
+    public PublicInquiryItem findById(Long itemId, Long en_uu) {
+        return saleService.findById(itemId);
     }
 
     /**
@@ -118,13 +118,13 @@ public class InquiryForSaleController {
     /**
      * 根据公共询价明细id查询报价信息，判断是否已报价
      *
-     * @param id
-     * @param enuu
+     * @param id 公共询价明细id
+     * @param en_uu 当前企业UU
      * @return
      */
     @RequestMapping(value = "/quote", method = RequestMethod.GET)
-    public PublicInquiryItem findBySourceId(Long id, Long enuu) {
-        return saleService.findBySourceIdAndEnuu(id, enuu);
+    public PublicInquiryItem findBySourceId(Long id, Long en_uu) {
+        return saleService.findBySourceIdAndEnuu(id, en_uu);
     }
 
     /**

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -3,15 +3,14 @@ package com.uas.ps.inquiry.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.inquiry.entity.*;
 import com.uas.ps.inquiry.model.PublicInquiryItemInfo;
-import com.uas.ps.inquiry.model.PublicInquiryReply;
 import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
-import com.uas.ps.inquiry.page.FilterCondition;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
 import com.uas.ps.inquiry.service.PublicInquiryService;
 import javassist.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -155,6 +154,8 @@ public class PublicInquiryController {
      */
     @RequestMapping(method = RequestMethod.GET)
     public Page<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
+        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        pageInfo.setSort(sort);
         return publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
     }
 
@@ -176,12 +177,12 @@ public class PublicInquiryController {
                                                     String keyword, String user_tel, Long fromDate, Long endDate) {
         ModelMap map = new ModelMap();
         PageInfo pageInfo = new PageInfo();
-        if (page == 0) {
+        if (page == 0 || page == null) {
             pageInfo.setPageNumber(1);
         } else {
             pageInfo.setPageNumber(page);
         }
-        if (size == 0) {
+        if (size == 0 || size == null) {
             pageInfo.setPageSize(5);
         } else {
             pageInfo.setPageSize(size);
@@ -224,6 +225,8 @@ public class PublicInquiryController {
      */
     @RequestMapping(value = "/quotation/list", method = RequestMethod.GET)
     public Page<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state) {
+        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        pageInfo.setSort(sort);
         SearchFilter searchFilter = JSONObject.parseObject(filter, SearchFilter.class);
         if (null != searchFilter.getVendUU()) {
             pageInfo.filter("vendUU", searchFilter.getVendUU());

src/main/java/com/uas/ps/inquiry/model/PublicInquiry.java

@@ -2,10 +2,12 @@ package com.uas.ps.inquiry.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.CollectionUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -379,5 +381,6 @@ public class PublicInquiry implements Serializable {
         this.recorder = inquiry.getRecorder();
         this.sourceApp = inquiry.getSourceapp();
         this.ship = inquiry.getShip();
+        this.setSourceId(inquiry.getId());
 	}
 }

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -153,7 +153,6 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                         newAttach.setPath(attach.getPath());
                         newAttach.setRelatedKey(attach.getRelatedKey());
                         newAttach.setSize(attach.getSize());
-                        newAttach.setRelatedKey(attach.getRelatedKey());
                         attachs.add(newAttach);
                     }
                     inquiry.setAttachs(attachs);
@@ -256,24 +255,6 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         // 先判断客户询价单是否存在这张单据
         if (CollectionUtils.isEmpty(saleInquiries)) {
             inquiry = new PublicInquiry(item.getInquiry());
-                inquiry.setSourceId(inquiry.getId());
-                inquiry.setId(null);
-                if (!CollectionUtils.isEmpty(inquiry.getAttachs())) {
-                    Set<Attach> attachs = new HashSet<Attach>();
-                    for (com.uas.ps.inquiry.model.Attach attach : inquiry.getAttachs()) {
-                        com.uas.ps.inquiry.model.Attach newAttach = new com.uas.ps.inquiry.model.Attach();
-                        newAttach.setDate(new Date());
-                        newAttach.setDescription(attach.getDescription());
-                        newAttach.setName(attach.getName());
-                        newAttach.setPath(attach.getPath());
-                        newAttach.setRelatedKey(attach.getRelatedKey());
-                        newAttach.setSize(attach.getSize());
-                        newAttach.setRelatedKey(attach.getRelatedKey());
-                        attachs.add(newAttach);
-                    }
-                    inquiry.setAttachs(attachs);
-
-                }
                 inquiry = inquiryDao.save(inquiry);
                 inquiryItem.setVendUU(enuu);
                 inquiryItem.setVendUserUU(useruu);
@@ -282,7 +263,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 inquiryItem.setBusinessCode(enterprise.getBusinesscode());
                 inquiryItem = SaveInquiryItems(inquiry, inquiryItem);
                 if (null != inquiryItem.getId()) {
-                    map.put("content", true);
+                    map.put("content", inquiryItem.getId());
                 } else {
                     map.put("content", false);
                 }
@@ -296,7 +277,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 inquiryItem.setInquiry(inquiry);
                 inquiryItem = SaveInquiryItems(inquiry, inquiryItem);
                 if (null != inquiryItem.getId()) {
-                    map.put("content", true);
+                    map.put("content", inquiryItem.getId());
                 } else {
                     map.put("content", false);
                 }