Просмотр исходного кода

更新模具询价详情查询方法

hejq 7 лет назад
Родитель
Сommit
cd01a0a0fe

+ 5 - 16
src/main/java/com/uas/platform/b2b/controller/SaleInquiryMouldController.java

@@ -2,13 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.PurchaseInquiryMould;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldDetail;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldInfo;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
-import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryMouldService;
@@ -34,12 +28,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.text.SimpleDateFormat;
@@ -359,7 +348,7 @@ public class SaleInquiryMouldController {
 	@RequestMapping(value = "/items/{inquiryMouldId}", method = RequestMethod.GET)
 	@ResponseBody
 	public List<PurchaseInquiryMouldItem> getInquiryMouldItemById(@PathVariable("inquiryMouldId") Long inquiryMouldId) {
-		PurchaseInquiryMould mould = purchaseInquiryMouldService.findById(inquiryMouldId);
+		PurchaseInquiryMouldInfo mould = purchaseInquiryMouldService.findById(inquiryMouldId);
 		@SuppressWarnings("unchecked")
 		List<PurchaseInquiryMouldItem> items = (List<PurchaseInquiryMouldItem>) mould.getInquiryMouldItems();
 		logger.log("客户模具询价单", "查看收到的客户模具询价单", null, mould.getCode(), inquiryMouldId);
@@ -374,7 +363,7 @@ public class SaleInquiryMouldController {
 	 */
 	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
 	@ResponseBody
-	public PurchaseInquiryMould getReceivedPurcInquiryMouldItemById(@PathVariable("id") Long id) {
+	public PurchaseInquiryMouldInfo getReceivedPurcInquiryMouldItemById(@PathVariable("id") Long id) {
 		return purchaseInquiryMouldService.findById(id);
 	}
 
@@ -441,7 +430,7 @@ public class SaleInquiryMouldController {
 	 */
 	 @RequestMapping(value = "/{inquiryMouldId}/history", method = RequestMethod.GET)
 	 @ResponseBody
-	 public PurchaseInquiryMould getInquiryMouldHistoryById(@PathVariable("inquiryMouldId") Long inquiryMouldId) {
+	 public PurchaseInquiryMouldInfo getInquiryMouldHistoryById(@PathVariable("inquiryMouldId") Long inquiryMouldId) {
 		 return purchaseInquiryMouldService.findById(inquiryMouldId);
 	 }
 

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/PurchaseInquiryMouldService.java

@@ -60,7 +60,7 @@ public interface PurchaseInquiryMouldService {
 	 * @param id
 	 * @return
 	 */
-	public PurchaseInquiryMould findById(Long id);
+	public PurchaseInquiryMouldInfo findById(Long id);
 
 	/**
 	 * 用询价单明细ID查找询价单明细

+ 2 - 2
src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryMouldServiceImpl.java

@@ -195,8 +195,8 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 	}
 
 	@Override
-	public PurchaseInquiryMould findById(Long id) {
-		return purchaseInquiryMouldDao.findOne(id);
+	public PurchaseInquiryMouldInfo findById(Long id) {
+		return purchaseInquiryMouldInfoDao.findOne(id);
 	}
 
 	@Override