|
|
@@ -2,10 +2,10 @@ 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.PurcInquiryItemInfo;
|
|
|
+import com.uas.ps.inquiry.model.*;
|
|
|
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.PublicInquiryService;
|
|
|
import javassist.NotFoundException;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -31,6 +31,9 @@ public class PublicInquiryController {
|
|
|
@Autowired
|
|
|
private PublicInquiryService publicInquiryService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private AttachService attachService;
|
|
|
+
|
|
|
/**
|
|
|
* 将买家ERP的公共询价写到公共询价服务中心
|
|
|
*
|
|
|
@@ -232,6 +235,8 @@ public class PublicInquiryController {
|
|
|
pageInfo.filter("vendUU", searchFilter.getVendUU());
|
|
|
} else if (null != searchFilter.getEnUU()) {
|
|
|
pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
|
|
|
+ } else {
|
|
|
+ throw new IllegalAccessError("请先传入企业信息");
|
|
|
}
|
|
|
if (null != _state) {
|
|
|
pageInfo = publicInquiryService.covert(pageInfo, _state);
|
|
|
@@ -250,4 +255,15 @@ public class PublicInquiryController {
|
|
|
public List<InquiryMessage> getList(Long enuu, Integer size) {
|
|
|
return publicInquiryService.getMessageList(enuu, size);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取附件信息
|
|
|
+ *
|
|
|
+ * @param id 附件id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/attachUrl", method = RequestMethod.GET)
|
|
|
+ public com.uas.ps.inquiry.model.Attach getAttach(Long id) {
|
|
|
+ return attachService.findById(id);
|
|
|
+ }
|
|
|
}
|