增加附件保存方法，增加询价明细保存方法

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

@@ -6,6 +6,7 @@ import com.uas.ps.inquiry.entity.BatchInquiry;
 import com.uas.ps.inquiry.entity.Inquiry;
 import com.uas.ps.inquiry.entity.InquiryDecide;
 import com.uas.ps.inquiry.entity.InquiryDetail;
+import com.uas.ps.inquiry.model.Attach;
 import com.uas.ps.inquiry.model.FileUpload;
 import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.model.PurcInquiry;
@@ -147,15 +148,15 @@ public class PublicInquiryController {
     }
 
     /**
-     * 作为卖家，保存更新公共询价单
+     * 作为卖家，新增报价
      *
      * @param item 前台数据
      * @return
      */
-    @RequestMapping(value = "/item/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/item/add", method = RequestMethod.POST)
     public String saveInquiryItem(@RequestBody PublicInquiryItem item) throws Exception {
-        item = publicInquiryService.save(item);
-        if (null != item) {
+        item = publicInquiryService.add(item);
+        if (null != item.getId()) {
             return JSONObject.toJSONString(item);
         } else {
             throw new Exception("保存失败");
@@ -185,12 +186,44 @@ public class PublicInquiryController {
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public String saveInquiryItem(@RequestBody PurcInquiry inquiry) throws Exception {
+    public String saveInquiry(@RequestBody PurcInquiry inquiry) throws Exception {
         inquiry = publicInquiryService.saveInquiry(inquiry);
-        if (null != inquiry) {
+        if (null != inquiry.getId()) {
             return JSONObject.toJSONString(inquiry);
         } else {
             throw new Exception("保存失败");
         }
     }
+
+    /**
+     * 保存询价信息（供应商、客户可能都会调用这条数据）
+     *
+     * @author hejq
+     * @date 2018-01-16 15:49
+     * @param inquiryItem 供应商报价信息
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/check", method = RequestMethod.POST)
+    public String saveItem(@RequestBody PublicInquiryItem inquiryItem) throws Exception {
+        inquiryItem = publicInquiryService.save(inquiryItem);
+        return JSONObject.toJSONString(inquiryItem);
+    }
+
+    /**
+     * 卖家报价时上传附件信息
+     *
+     * @param attach 附件信息
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/attach", method = RequestMethod.POST)
+    public String addAttachs(@RequestBody Attach attach) throws Exception {
+        attach = publicInquiryService.addAttachs(attach);
+        if (null != attach.getId()) {
+            return JSONObject.toJSONString(attach);
+        } else {
+            throw new Exception("保存失败");
+        }
+    }
 }

src/main/java/com/uas/ps/inquiry/dao/AttachDao.java

@@ -0,0 +1,15 @@
+package com.uas.ps.inquiry.dao;
+
+import com.uas.ps.inquiry.model.Attach;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 附件信息数据库操作
+ *
+ * Created by hejq on 2018-01-16.
+ */
+@Repository
+public interface AttachDao extends JpaRepository<Attach, Long>, JpaSpecificationExecutor<Attach> {
+}

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -4,10 +4,7 @@ import com.uas.ps.inquiry.entity.BatchInquiry;
 import com.uas.ps.inquiry.entity.Inquiry;
 import com.uas.ps.inquiry.entity.InquiryDecide;
 import com.uas.ps.inquiry.entity.InquiryDetail;
-import com.uas.ps.inquiry.model.FileUpload;
-import com.uas.ps.inquiry.model.PublicInquiry;
-import com.uas.ps.inquiry.model.PublicInquiryItem;
-import com.uas.ps.inquiry.model.PurcInquiry;
+import com.uas.ps.inquiry.model.*;
 import javassist.NotFoundException;
 import org.springframework.ui.ModelMap;
 
@@ -145,7 +142,7 @@ public interface PublicInquiryService {
      * @param item 报价信息
      * @return
      */
-    PublicInquiryItem save(PublicInquiryItem item);
+    PublicInquiryItem add(PublicInquiryItem item);
 
     /**
      * 保存询价信息
@@ -156,5 +153,21 @@ public interface PublicInquiryService {
      * @return
      */
     List<PublicInquiryItem> save(List<PublicInquiryItem> items);
+
+    /**
+     * 保存询价信息（供应商、客户可能都会调用这条数据）
+     *
+     * @param inquiryItem 报价信息
+     * @return
+     */
+    PublicInquiryItem save(PublicInquiryItem inquiryItem);
+
+    /**
+     * 供应商报价时上传附件信息
+     *
+     * @param attach
+     * @return
+     */
+    Attach addAttachs(Attach attach);
 }
 

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

@@ -47,6 +47,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     @Autowired
     private PublicInquiryReplyDao publicInquiryReplyDao;
 
+    @Autowired
+    private AttachDao attachDao;
+
     /**
      * 应用来源
      */
@@ -497,7 +500,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      * @date 2018-01-14 16:43
      */
     @Override
-    public PublicInquiryItem save(PublicInquiryItem item) {
+    public PublicInquiryItem add(PublicInquiryItem item) {
         jdbcTemplate.update("insert into public$inquiryitems(id_id,id_number,id_currency,id_fromdate,id_todate,id_taxrate,id_prid,id_venduu,"
                         + "id_venduseruu,id_sourceapp,id_status,id_custlap,id_sendstatus,id_sourceid,id_inid,id_kind) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
                 item.getId(), item.getNumber(), item.getCurrency(), item.getFromDate(), item.getToDate(),
@@ -526,4 +529,26 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         return publicInquiryItemDao.save(items);
     }
 
+    /**
+     * 保存询价信息（供应商、客户可能都会调用这条数据）
+     *
+     * @param inquiryItem 报价信息
+     * @return
+     */
+    @Override
+    public PublicInquiryItem save(PublicInquiryItem inquiryItem) {
+        return publicInquiryItemDao.save(inquiryItem);
+    }
+
+    /**
+     * 供应商报价时上传附件信息
+     *
+     * @param attach
+     * @return
+     */
+    @Override
+    public Attach addAttachs(Attach attach) {
+        return attachDao.save(attach);
+    }
+
 }