询价单操作记录日志

src/main/java/com/uas/platform/b2b/controller/PurcInquiryController.java

@@ -63,42 +63,58 @@ public class PurcInquiryController {
 	/**
 	 * 保存（或修改）
 	 *
-	 * @param inquiry
-	 * @param contacts
-	 * @param uploadItem
+	 * @param inquiry inquiry 信息
+	 * @param contacts 联系人信息（供应商）
+	 * @param uploadItem 附件
 	 * @return
 	 */
 	@RequestMapping(value = "/save/withVendor", method = RequestMethod.POST)
 	private ModelMap save(String inquiry, String contacts, FileUpload uploadItem) {
 		PurcInquiryInfo purcInquiry = JSONObject.parseObject(inquiry, PurcInquiryInfo.class);
 		List<VendorAndContact> vendors = FlexJsonUtils.fromJsonArray(contacts, VendorAndContact.class);
+		if (purcInquiry.getId() == null) {
+			logger.log("采购询价", "新增保存采购询价信息");
+		} else {
+			logger.log("采购询价", "修改保存采购询价信息", "关联id: " + purcInquiry.getId());
+		}
 		return purcInquiryService.save(purcInquiry, vendors, uploadItem);
 	}
 
 	/**
 	 * 保存、更新（公共）
 	 *
-	 * @param inquiry
+	 * @param inquiry inquiry信息
+	 * @param uploadItem  附件
 	 * @return
 	 */
 	@RequestMapping(value = "/save/withoutVendor", method = RequestMethod.POST)
 	private ModelMap saveWithoutVendor(String inquiry, FileUpload uploadItem) {
 		PurcInquiryInfo purcInquiry = JSONObject.parseObject(inquiry, PurcInquiryInfo.class);
+		if (purcInquiry.getId() == null) {
+			logger.log("公共询价", "新增保存公共询价信息");
+		} else {
+			logger.log("公共询价", "修改保存公共询价信息", "关联id: " + purcInquiry.getId());
+		}
 		return purcInquiryService.saveWithoutVendor(purcInquiry, uploadItem);
 	}
 
 	/**
 	 * 保存并提交
 	 *
-	 * @param inquiry
-	 * @param contacts
-	 * @param uploadItem
+	 * @param inquiry inquiry信息
+	 * @param contacts 联系人信息
+	 * @param uploadItem 附件
 	 * @return
 	 */
 	@RequestMapping(value = "/submit/withVendor", method = RequestMethod.POST)
 	private ModelMap saveAndSubmit(String inquiry, String contacts, FileUpload uploadItem) {
 		PurcInquiryInfo purcInquiry = JSONObject.parseObject(inquiry, PurcInquiryInfo.class);
 		List<VendorAndContact> vendors = FlexJsonUtils.fromJsonArray(contacts, VendorAndContact.class);
+		if (purcInquiry.getId() == null) {
+			logger.log("采购询价", "新增发布采购询价信息");
+		} else {
+			logger.log("采购询价", "修改发布采购询价信息", "关联id: " + purcInquiry.getId());
+		}
 		return purcInquiryService.saveAndSubmit(purcInquiry, vendors, uploadItem);
 	}
 
@@ -112,29 +128,36 @@ public class PurcInquiryController {
 	@RequestMapping(value = "/submit/withoutVendor", method = RequestMethod.POST)
 	private ModelMap saveAndSubmitWithoutVendor(String inquiry, FileUpload uploadItem) {
 		PurcInquiryInfo purcInquiry = JSONObject.parseObject(inquiry, PurcInquiryInfo.class);
+		if (purcInquiry.getId() == null) {
+			logger.log("公共询价", "新增发布公共询价信息");
+		} else {
+			logger.log("公共询价", "修改发布公共询价信息", "关联id: " + purcInquiry.getId());
+		}
 		return purcInquiryService.saveAndSubmitWithoutVendor(purcInquiry, uploadItem);
 	}
 
 	/**
 	 * 提交
 	 *
-	 * @param id
+	 * @param id 主表id
 	 * @return
 	 */
 	@RequestMapping(value = "/submit/update", method = RequestMethod.POST)
 	private ModelMap sumbit(Long id) {
+		logger.log("采购（公共）询价", "发布询价信息", "关联id: " + id);
 		return purcInquiryService.sumbit(id);
 	}
 
 	/**
 	 * 删除明细一条数据
 	 *
-	 * @param id
+	 * @param id 明细id
 	 * @return
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "deleteById/{id}", method = RequestMethod.DELETE)
 	private ModelMap deleteById(@PathVariable Long id) throws Exception {
+		logger.log("采购（公共）询价", "删除询价明细", "关联id: " + id);
 		return purcInquiryService.deleteById(id);
 	}
 
@@ -147,6 +170,7 @@ public class PurcInquiryController {
 	 */
 	@RequestMapping(value = "clearOrder/{id}", method = RequestMethod.DELETE)
 	private ModelMap clearOrder(@PathVariable Long id) throws Exception {
+		logger.log("采购（公共）询价", "删除询价信息", "关联id: " + id);
 		return purcInquiryService.clearOrder(id);
 
 	}
@@ -322,11 +346,12 @@ public class PurcInquiryController {
 	/**
 	 * 已发布
 	 *
-	 * @param params
+	 * @param params 分页参数
 	 * @return
 	 */
 	@RequestMapping(value = "/info/nosearch", params = "_state=submit", method = RequestMethod.GET)
 	private Page<PurcInquiry> getSubmit(PageParams params) {
+		logger.log("采购询价", "查看询价", "查看了已发布的询价信息");
 		return purcInquiryService.getSubmit(params);
 	}
 
@@ -338,6 +363,7 @@ public class PurcInquiryController {
 	 */
 	@RequestMapping(value = "/accept/{id}", method = RequestMethod.POST)
 	private ModelMap acceptInquiry(@PathVariable Long id) {
+		logger.log("采购询价", "采纳报价", "关联id： " + id);
 		return purcInquiryService.acceptInquiry(id);
 	}
 
@@ -349,6 +375,7 @@ public class PurcInquiryController {
 	 */
 	@RequestMapping(value = "/refuse/{id}", method = RequestMethod.POST)
 	private ModelMap refuseInquiry(@PathVariable Long id) {
+		logger.log("采购询价", "拒绝报价", "关联id： " + id);
 		return purcInquiryService.refuseInquiry(id);
 	}
 
@@ -360,11 +387,12 @@ public class PurcInquiryController {
 	 */
 	@RequestMapping(value = "/submit/updatePublic", method = RequestMethod.POST)
 	private ModelMap pubishInquiry(Long id) {
+		logger.log("公共询价", "发布询价", "关联id： " + id);
 		return purcInquiryService.pubishInquiry(id);
 	}
 
 	/**
-	 * 查询公共询价单
+	 * 查询公共询价单（弃用）
 	 *
 	 * @param params
 	 * @param keyword
@@ -379,14 +407,15 @@ public class PurcInquiryController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryCheckIds(keyword, pageParams);
 	}
 
 	/**
 	 * 查询公共询价单
 	 *
-	 * @param params
-	 * @param searchFilter
+	 * @param params 分页参数
+	 * @param searchFilter 过滤条件
 	 * @return
 	 */
 	@RequestMapping(value = "/publicInquiryItem", method = RequestMethod.GET)
@@ -403,6 +432,7 @@ public class PurcInquiryController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryItemCheckIds(keyword, pageParams);
 	}
 
@@ -425,6 +455,7 @@ public class PurcInquiryController {
 	 */
 	@RequestMapping(value = "/inquiryItem/{id}", method = RequestMethod.GET)
 	private ModelMap getInquiryItemDetail(@PathVariable Long id) {
+		logger.log("采购询价", "查看询价详情", "关联id：" + id);
 		return purcInquiryService.getInquiryItemDetail(id);
 	}
 
@@ -436,6 +467,7 @@ public class PurcInquiryController {
 	 */
 	@RequestMapping(value = "/transtoInquiry/{id}", method = RequestMethod.POST)
 	private ModelMap transtoInquiry(@PathVariable Long id) {
+		logger.log("公共询价", "转客户询价", "关联id：" + id);
 		return purcInquiryService.transtoInquiry(id);
 	}