|
|
@@ -18,6 +18,7 @@ import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
|
|
|
import com.uas.ps.inquiry.page.PageInfo;
|
|
|
import com.uas.ps.inquiry.page.SearchFilter;
|
|
|
import com.uas.ps.inquiry.service.AttachService;
|
|
|
+import com.uas.ps.inquiry.service.InquiryForSaleService;
|
|
|
import com.uas.ps.inquiry.service.PublicInquiryService;
|
|
|
import com.uas.ps.inquiry.support.InquiryBufferedLogger;
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
@@ -51,6 +52,9 @@ public class PublicInquiryController {
|
|
|
@Autowired
|
|
|
private AttachService attachService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private InquiryForSaleService saleService;
|
|
|
+
|
|
|
private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
|
|
|
|
|
|
/**
|
|
|
@@ -293,6 +297,69 @@ public class PublicInquiryController {
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 移动端查询公共询价列表信息
|
|
|
+ *
|
|
|
+ * @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) {
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ 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);
|
|
|
+ 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.findByPageInfo(pageInfo, filter).getContent());
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 通过分页信息和过滤条件查询已转报价的信息
|
|
|
*
|