移动端查询接口调整；保存时主表结构调整

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

@@ -161,19 +161,29 @@ public class PublicInquiryController {
     }
 
     /**
-     * 移动端查询公共询价列表
+     * 移动端查询公共询价列表信息
      *
-     * @param pageSize 分页大小
-     * @param pageNumber 页码
-     * @param enuu enuu
+     * @param page 页码
+     * @param size 每页大小
+     * @param en_uu 企业UU
+     * @param state 过滤状态
+     * @param keyword 搜索词
+     * @param user_tel 电话
+     * @param fromDate 开始日期
+     * @param endDate 截止日期
      * @return
      */
     @RequestMapping(value = "/mobile", method = RequestMethod.GET)
-    public Page<PurcInquiryItemInfo> publincInquiry(Integer pageSize, Integer pageNumber, Long enuu) {
+    public Page<PurcInquiryItemInfo> publincInquiry(Integer page, Integer size, Long en_uu, String state,
+                                                    String keyword, String user_tel, Long fromDate, Long endDate) {
         PageInfo pageInfo = new PageInfo();
-        pageInfo.setPageNumber(pageNumber);
-        pageInfo.setPageSize(pageSize);
-        return publicInquiryService.findTodoByPageInfo(pageInfo, null);
+        pageInfo.setPageNumber(page);
+        pageInfo.setPageSize(size);
+        SearchFilter filter = new SearchFilter();
+        filter.setFromDate(fromDate);
+        filter.setEndDate(endDate);
+        filter.setKeyword(keyword);
+        return publicInquiryService.findTodoByPageInfo(pageInfo, filter);
     }
 
     /**

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

@@ -67,7 +67,7 @@ public class PublicInquiryItem implements Serializable {
 	/**
 	 * 产品
 	 */
-	@OneToOne(cascade = {CascadeType.ALL})
+	@OneToOne(cascade = {CascadeType.MERGE})
 	@JoinColumn(name = "id_prid", insertable = false, updatable = false)
 	private Product product;
 

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

@@ -150,6 +150,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                     inquiry.setAttachs(attachs);
 
                 }
+                inquiry = inquiryDao.save(inquiry);
                 Set<PublicInquiryItem> items = new HashSet<PublicInquiryItem>();
                 Short i = 0;
                 if (null != inquiryItem) {