返回UAS报价单实体修改

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

@@ -108,6 +108,7 @@ public class InquiryForSaleController {
      * @param item 前台数据
      * @return
      */
+    @Deprecated
     @HttpLog
     @RequestMapping(value = "/item/add", method = RequestMethod.POST)
     public String saveInquiryItem(@RequestBody PublicInquiryItem item) throws Exception {
@@ -126,7 +127,9 @@ public class InquiryForSaleController {
      *
      * @param item 前台数据
      * @return
+     *   报价后续统一调用  /item/saveQuote
      */
+    @Deprecated
     @HttpLog
     @RequestMapping(value = "/item/save", method = RequestMethod.POST)
     public String saveInquiryItems(@RequestBody PublicInquiryItem item) throws Exception {

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

@@ -120,133 +120,6 @@ public class PublicInquiryController {
         return infoIPage;
     }
 
-    /**
-     * 移动端查询公共询价列表信息
-     *
-     * @param page     页码
-     * @param size     每页大小
-     * @param en_uu    企业UU
-     * @param _state   过滤状态
-     * @param keyword  搜索词
-     * @param user_tel 电话
-     * @param fromDate 开始日期
-     * @param endDate  截止日期
-     * @return
-     */
-    @HttpLog
-    @RequestMapping(value = "/mobile", method = RequestMethod.GET)
-    public ModelMap publincInquiry(Integer page, Integer size, Long en_uu, String _state,
-                                   String keyword, String user_tel, Long fromDate, Long endDate) {
-        long start = System.currentTimeMillis();
-        ModelMap map = new ModelMap();
-        PageInfo pageInfo = setPageInfo(page, size);
-        SearchFilter filter = new SearchFilter();
-        filter.setFromDate(fromDate);
-        filter.setEndDate(endDate);
-        filter.setKeyword(keyword);
-        if (StringUtils.hasText(_state)) {
-            if (_state.equals(OrderStatus.end.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                pageInfo.filter("overdue", Constant.YES);
-                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
-                return map;
-            } else if (_state.equals(OrderStatus.invalid.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                pageInfo.filter("invalid", Constant.YES);
-                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
-                return map;
-            } else if (_state.equals(OrderStatus.done.name())) {
-                logger.log("公共询价", "查询已转报价询价列表信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                filter.setVendUU(en_uu);
-                filter.setKeyword(keyword);
-                map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
-                return map;
-            }
-        } else {
-            filter.setEnUU(en_uu);
-            logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-            map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
-            return map;
-        }
-        log.info("/inquiry/mobile 耗时:" + (System.currentTimeMillis() - start));
-        return map;
-    }
-
-    /**
-     * 设置分页信息
-     * @param page  页码
-     * @param size  条数
-     * @return
-     */
-    private PageInfo setPageInfo(Integer page, Integer size) {
-        PageInfo pageInfo = new PageInfo();
-        if (page == null || page == 0) {
-            pageInfo.setPageNumber(1);
-        } else {
-            pageInfo.setPageNumber(page);
-        }
-        if (size == null || size == 0) {
-            pageInfo.setPageSize(5);
-        } else {
-            pageInfo.setPageSize(size);
-        }
-        pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
-        Sort sort = new Sort(Sort.Direction.DESC, "date");
-        pageInfo.setSort(sort);
-        return pageInfo;
-    }
-
-    /**
-     * 移动端查询公共询价列表信息
-     *
-     * @param page     页码
-     * @param size     每页大小
-     * @param en_uu    企业UU
-     * @param _state   过滤状态
-     * @param keyword  搜索词
-     * @param user_tel 电话
-     * @param fromDate 开始日期
-     * @param endDate  截止日期
-     * @return
-     */
-    @HttpLog
-    @RequestMapping(value = "/mobile/v2", method = RequestMethod.GET)
-    public ModelMap publicInquiry(Integer page, Integer size, Long en_uu, String _state,
-                                  String keyword, String user_tel, Long fromDate, Long endDate) {
-        long start = System.currentTimeMillis();
-        ModelMap map = new ModelMap();
-        PageInfo pageInfo = setPageInfo(page, size);
-        SearchFilter filter = new SearchFilter();
-        filter.setFromDate(fromDate);
-        filter.setEndDate(endDate);
-        filter.setKeyword(keyword);
-        if (StringUtils.hasText(_state)) {
-            if (_state.equals(OrderStatus.end.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                pageInfo.filter("overdue", Constant.YES);
-                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
-                return map;
-            } else if (_state.equals(OrderStatus.invalid.name())) {
-                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                pageInfo.filter("invalid", Constant.YES);
-                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
-                return map;
-            } else if (_state.equals(OrderStatus.done.name())) {
-                logger.log("公共询价", "查询已转报价询价列表信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-                filter.setVendUU(en_uu);
-                filter.setKeyword(keyword);
-                map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
-                return map;
-            }
-        } else {
-            logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
-            pageInfo.filter("vendUU", en_uu);
-            map.put("content", publicInquiryService.covertRemindToInquiry(saleService.findRemindByPageInfo(pageInfo, filter).getContent()));
-            return map;
-        }
-        log.info("/inquiry/public/mobile/v2 耗时:" + (System.currentTimeMillis() - start));
-        return map;
-    }
 
     /**
      * 通过分页信息和过滤条件查询已转报价的信息
@@ -422,4 +295,136 @@ public class PublicInquiryController {
         log.info("/inquiry/public/getPurcInquiryItemCountByMonth 耗时:" + (System.currentTimeMillis() - start));
         return map;
     }
+
+    /* ===========================================app接口start============================================================ */
+
+    /**
+     * 移动端查询公共询价列表信息
+     *
+     * @param page     页码
+     * @param size     每页大小
+     * @param en_uu    企业UU
+     * @param _state   过滤状态
+     * @param keyword  搜索词
+     * @param user_tel 电话
+     * @param fromDate 开始日期
+     * @param endDate  截止日期
+     * @return
+     */
+    @HttpLog
+    @RequestMapping(value = "/mobile", method = RequestMethod.GET)
+    public ModelMap publincInquiry(Integer page, Integer size, Long en_uu, String _state,
+                                   String keyword, String user_tel, Long fromDate, Long endDate) {
+        long start = System.currentTimeMillis();
+        ModelMap map = new ModelMap();
+        PageInfo pageInfo = setPageInfo(page, size);
+        SearchFilter filter = new SearchFilter();
+        filter.setFromDate(fromDate);
+        filter.setEndDate(endDate);
+        filter.setKeyword(keyword);
+        if (StringUtils.hasText(_state)) {
+            if (_state.equals(OrderStatus.end.name())) {
+                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                pageInfo.filter("overdue", Constant.YES);
+                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                return map;
+            } else if (_state.equals(OrderStatus.invalid.name())) {
+                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                pageInfo.filter("invalid", Constant.YES);
+                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                return map;
+            } else if (_state.equals(OrderStatus.done.name())) {
+                logger.log("公共询价", "查询已转报价询价列表信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                filter.setVendUU(en_uu);
+                filter.setKeyword(keyword);
+                map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
+                return map;
+            }
+        } else {
+            filter.setEnUU(en_uu);
+            logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+            map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+            return map;
+        }
+        log.info("/inquiry/mobile 耗时:" + (System.currentTimeMillis() - start));
+        return map;
+    }
+
+    /**
+     * 设置分页信息
+     * @param page  页码
+     * @param size  条数
+     * @return
+     */
+    private PageInfo setPageInfo(Integer page, Integer size) {
+        PageInfo pageInfo = new PageInfo();
+        if (page == null || page == 0) {
+            pageInfo.setPageNumber(1);
+        } else {
+            pageInfo.setPageNumber(page);
+        }
+        if (size == null || size == 0) {
+            pageInfo.setPageSize(5);
+        } else {
+            pageInfo.setPageSize(size);
+        }
+        pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
+        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        pageInfo.setSort(sort);
+        return pageInfo;
+    }
+
+    /**
+     * 移动端查询公共询价列表信息
+     *
+     * @param page     页码
+     * @param size     每页大小
+     * @param en_uu    企业UU
+     * @param _state   过滤状态
+     * @param keyword  搜索词
+     * @param user_tel 电话
+     * @param fromDate 开始日期
+     * @param endDate  截止日期
+     * @return
+     */
+    @HttpLog
+    @RequestMapping(value = "/mobile/v2", method = RequestMethod.GET)
+    public ModelMap publicInquiry(Integer page, Integer size, Long en_uu, String _state,
+                                  String keyword, String user_tel, Long fromDate, Long endDate) {
+        long start = System.currentTimeMillis();
+        ModelMap map = new ModelMap();
+        PageInfo pageInfo = setPageInfo(page, size);
+        SearchFilter filter = new SearchFilter();
+        filter.setFromDate(fromDate);
+        filter.setEndDate(endDate);
+        filter.setKeyword(keyword);
+        if (StringUtils.hasText(_state)) {
+            if (_state.equals(OrderStatus.end.name())) {
+                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                pageInfo.filter("overdue", Constant.YES);
+                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                return map;
+            } else if (_state.equals(OrderStatus.invalid.name())) {
+                logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                pageInfo.filter("invalid", Constant.YES);
+                map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
+                return map;
+            } else if (_state.equals(OrderStatus.done.name())) {
+                logger.log("公共询价", "查询已转报价询价列表信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+                filter.setVendUU(en_uu);
+                filter.setKeyword(keyword);
+                map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
+                return map;
+            }
+        } else {
+            logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
+            pageInfo.filter("vendUU", en_uu);
+            map.put("content", publicInquiryService.covertRemindToInquiry(saleService.findRemindByPageInfo(pageInfo, filter).getContent()));
+            return map;
+        }
+        log.info("/inquiry/public/mobile/v2 耗时:" + (System.currentTimeMillis() - start));
+        return map;
+    }
+    /* ===========================================app接口end============================================================ */
+
 }

src/main/java/com/uas/ps/inquiry/entity/InquiryDetail.java

@@ -286,6 +286,14 @@ public class InquiryDetail {
 		this.id_incode = id_incode;
 	}
 
+	public String getVe_contacttel() {
+		return ve_contacttel;
+	}
+
+	public void setVe_contacttel(String ve_contacttel) {
+		this.ve_contacttel = ve_contacttel;
+	}
+
 	public InquiryDetail() {
 
 	}