相关操作增加操作日志，去除无效方法等

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

@@ -5,7 +5,6 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.publicapi.service.InviteRecordService;
-import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
@@ -39,9 +38,6 @@ public class InvitationRecordController {
 	@Autowired
 	private InvitationRecordService invitationRecordService;
 
-	@Autowired
-	private SearchService searchService;
-
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
     @Autowired

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -30,7 +31,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -131,9 +131,8 @@ public class MakeAcceptController {
 		PageParams params = new PageParams();
 		params.setPage(1);
 		params.setCount(JxlsExcelView.MAX_SIZE);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		SearchFilter filter = new SearchFilter();
 		filter.setKeyword(keyword);
 		filter.setFromDate(fromDate);

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -31,7 +32,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -149,9 +149,8 @@ public class MakeOrderChangeController {
 		PageParams params = new PageParams();
 		params.setCount(JxlsExcelView.MAX_SIZE);
 		params.setPage(1);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "全部");
 		modelAndView.addObject("data", getReceivedPurchaseOrderChanges(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeChange", "委外变更单列表_全部"));

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -27,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -138,9 +138,8 @@ public class MakeOutOrderController {
 		searchPageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		List<MakeOrder> makeOrders =  searchService.searchMakeOrderIds(keyword, searchPageParams).getContent();
 
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "全部");
 		modelAndView.addObject("data", makeOrders);
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOutOrder", "委外加工单列表_全部"));

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -28,7 +29,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -127,9 +127,8 @@ public class MakeReturnController {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("data",
 				makeReturnService.findAllByPageInfo(pageInfo, keyword, fromDate, endDate).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeReturn", "委外验退单列表"));

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

@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -340,7 +339,7 @@ public class ProductController {
 	@RequestMapping(value = "/matchResult/info", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProduct(PageParams params, String keyword) {
-		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（全部）");
+		logger.log("查看产品", "查看物料信息（全部）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());
 		pageInfo.filter("b2cEnabled", Constant.YES);
@@ -353,7 +352,7 @@ public class ProductController {
 	@RequestMapping(value = "/matchResult/info", params = RequestState.STANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProductStandard(PageParams params, String keyword) {
-		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（标准）");
+		logger.log("查看产品", "查看物料信息（标准）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isSale", Constant.YES);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());
@@ -366,7 +365,7 @@ public class ProductController {
 	@RequestMapping(value = "/matchResult/info", params = RequestState.NONSTANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProductNonStandard(PageParams params, String keyword) {
-		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（非标准）");
+		logger.log("查看产品", "查看物料信息（非标准）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isPurchase", Constant.YES);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());

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

@@ -33,7 +33,8 @@ import java.util.Map;
 /**
  * 用户个人产品库
  *
- * Created by hejq on 2017-11-08.
+ * @author hejq
+ * @date 2017-11-08
  */
 @RequestMapping(value = "/productuser")
 @RestController

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

@@ -22,7 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 公共询价（针对供应商）
  *
- * Created by hejq on 2018-01-06.
+ * @author hejq
+ * @date 2018-01-06
  */
 @RequestMapping("/sale/pubInquiry")
 @RestController

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

@@ -24,7 +24,8 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 公共询价（针对客户）
  *
- * Created by hejq on 2018-01-08.
+ * @author hejq
+ * @date 2018-01-08
  */
 @RequestMapping("/purc/pubInquiry")
 @RestController

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.service.CustomerService;
@@ -26,14 +27,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 首页公共询价列表数据
  *
- * Created by hejq on 2018-01-17.
+ * @author hejq
+ * @date 2018-01-17
  */
 @RequestMapping("/pubInquiry")
 @RestController
@@ -162,15 +163,23 @@ public class PubInquiryListController {
         filter.setEndDate(endDate);
         filter.setKeyword(keyword);
         filter.setUserUU(SystemSession.getUser().getUserUU());
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         ModelAndView modelAndView = new ModelAndView();
-        modelAndView.addObject("dateFormat", dateFormat);
-        if (StringUtils.isEmpty(state) || state.equals("all")) {
+        modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
+        // 全部
+        String allState = "all";
+        // 客户
+        String customerState = "customer";
+        // 个人商机
+        String remindState = "remind";
+        // 企业商机
+        String enterpirseState = "enterprise";
+        if (StringUtils.isEmpty(state) || allState.equals(state)) {
             modelAndView.addObject("state", "全部");
             modelAndView.addObject("data", enquiryService.fingByPageInfo(pageInfo, filter, null).getContent());
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/publicInquiry", "公共询价单列表"));
             logger.log("公共询价单", "导出Excel列表", "导出公共询价列表（全部）");
-        } else if (state.equals("customer")) {// 导出客户询价列表
+        } else if (customerState.equals(state)) {
+            // 导出客户询价列表
             modelAndView.addObject("state", "我的客户询价");
             List<Long> uuList = customerService.getCustomerDistribute();
             if (CollectionUtils.isEmpty(uuList)) {
@@ -179,14 +188,15 @@ public class PubInquiryListController {
             modelAndView.addObject("data", enquiryService.fingByPageInfo(pageInfo, filter, uuList).getContent());
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/publicInquiry", "客户公共询价列表"));
             logger.log("公共询价单", "导出Excel列表", "导出我的客户询价列表");
-        } else if (state.equals("remind")) {
+        } else if (remindState.equals(state)) {
             modelAndView.addObject("state", "个人商机询价列表");
             List<InquiryRemind> reminds = InquiryUtils.getRemind(pageInfo, filter, SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu()).getContent();
             modelAndView.addObject("data", !CollectionUtils.isEmpty(reminds) ? reminds : new ArrayList<InquiryRemind>());
             modelAndView.addObject("title", "个人商机询价列表");
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/inquiryRemind", "个人商机询价列表"));
             logger.log("公共询价单", "导出Excel列表", "导出个人商机询价列表");
-        } else if (state.equals("enterprise")) { // 导出企业商机
+        } else if (enterpirseState.equals(state)) {
+            // 导出企业商机
             modelAndView.addObject("state", "企业商机询价列表");
             List<InquiryRemind> reminds = InquiryUtils.getEngerpriseRemind(pageInfo, filter, SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu()).getContent();
             modelAndView.addObject("data", !CollectionUtils.isEmpty(reminds) ? reminds : new ArrayList<InquiryRemind>());

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

@@ -102,8 +102,7 @@ public class PublicQueryController {
 	@ResponseBody
 	public Map<String, Map<String, Object>> queryEnterprises(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		if (!StringUtils.isEmpty(data)) {
-			List<String> accounts = null;
-			// data = URLDecoder.decode(data, "UTF-8");
+			List<String> accounts;
 			// 多个
 			if (data.startsWith("[")) {
 				accounts = FlexJsonUtils.fromJsonArray(data, String.class);
@@ -221,11 +220,10 @@ public class PublicQueryController {
 	@RequestMapping(value = "/Validation", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap validation(@RequestBody String enterprise) {
-		Enterprise enter = FlexJsonUtils.fromJson(enterprise, Enterprise.class);// 需要把字符串转成Object
+		// 需要把字符串转成Object
+		Enterprise enter = FlexJsonUtils.fromJson(enterprise, Enterprise.class);
 		ModelMap map = new ModelMap();
 		map.put("tel", userService.isTelUseable(enter.getEnAdminTel()));
-		// map.put("email",
-		// userService.isEmailUseable(enter.getEnAdminEmail()));
 		map.put("bussinessCode", enterpriseService.bussinessCodeEnable(enter.getEnBussinessCode()));
 		return map;
 	}
@@ -240,7 +238,8 @@ public class PublicQueryController {
 	public Map<String, Object> register(String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		Map<String, Object> infos = new HashMap<String, Object>();
-		Enterprise newEnterprise = FlexJsonUtils.fromJson(jsonStr, Enterprise.class);// 需要把字符串转成Object
+		// 需要把字符串转成Object
+		Enterprise newEnterprise = FlexJsonUtils.fromJson(jsonStr, Enterprise.class);
 		boolean ok = false;
 		String error = null;
 		Map<String, Object> checkinfos = checkRegister(newEnterprise);
@@ -254,7 +253,8 @@ public class PublicQueryController {
 			}
 		} else {
 			Enterprise regEnterprise = enterpriseService.registerERPEnterprise(newEnterprise);
-			if (regEnterprise == null) {// 营业执照码验证
+			// 营业执照码验证
+			if (regEnterprise == null) {
 				error = "注册失败!";
 			} else {
 				ok = true;
@@ -390,10 +390,12 @@ public class PublicQueryController {
 						User user = null;
 						if (ok == false) {
 							user = new User();
-							user.setUserName(emName);// 管理员姓名
+                            // 管理员姓名
+							user.setUserName(emName);
 							user.setUserTel(emMobile);
 							user.setEnable(Constant.YES);
-							user.addEnterprise(os);// 添加userenterpris对应关系
+                            // 添加userenterpris对应关系
+							user.addEnterprise(os);
 							User newUser = userDao.save(user);
 							newUser.setUserPwd(Md5Utils.encode(emPassword, newUser.getUserUU()));
 							userDao.save(newUser);
@@ -402,8 +404,10 @@ public class PublicQueryController {
 							} else {
 								os.setEnAdminuu(newUser.getUserUU());
 								os.setEnAdminPassword(emPassword);
-								os = enterpriseDao.save(os);// 再次保存enterprise
-								enterpriseDao.callInitProcedure(os.getUu());// 设置对照关系
+                                // 再次保存enterprise
+								os = enterpriseDao.save(os);
+                                // 设置对照关系
+								enterpriseDao.callInitProcedure(os.getUu());
 							}
 							ok = true;
 							infos.put("enuu", os.getUu());
@@ -453,8 +457,7 @@ public class PublicQueryController {
 	@ResponseBody
 	public List<ModelMap> getEnterprises(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		if (!StringUtils.isEmpty(data)) {
-			List<String> accounts = null;
-			// data = URLDecoder.decode(data, "UTF-8");
+			List<String> accounts;
 			// 多个
 			if (data.startsWith("[")) {
 				accounts = FlexJsonUtils.fromJsonArray(data, String.class);

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

@@ -36,7 +36,8 @@ import java.util.Map;
 /**
  * 采购变更单
  *
- * Created by hejq on 2018-06-22.
+ * @author hejq
+ * @date 2018-06-22
  */
 @RestController
 @RequestMapping("/purc/change")

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SaleARCheckItem;
 import com.uas.platform.b2b.model.SaleARCheckReply;
@@ -30,7 +31,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -58,9 +58,10 @@ public class PurchaseARCheckController {
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
-	 * 作为买家，获取应付对账单（全部）
-	 * 
-	 * @param json
+	 *  作为买家，获取应付对账单（全部）
+	 *
+	 * @param params 分页参数
+	 * @param searchFilter 过滤条件
 	 * @return
 	 */
 	@RequestMapping(method = RequestMethod.GET)
@@ -187,7 +188,6 @@ public class PurchaseARCheckController {
 	/**
 	 * 获取明细的对账回复记录
 	 * 
-	 * @param json
 	 * @param itemId
 	 */
 	@RequestMapping(value = "/items/{itemId}/reply", method = RequestMethod.GET)
@@ -200,7 +200,8 @@ public class PurchaseARCheckController {
 	/**
 	 * 导出Excel
 	 * 
-	 * @param params
+	 * @param keyword
+     * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
@@ -208,9 +209,8 @@ public class PurchaseARCheckController {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		SearchFilter filter = null;
 		if (StringUtils.hasText(searchFilter)) {
 			filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);

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

@@ -1,13 +1,17 @@
 package com.uas.platform.b2b.controller;
 
+import com.uas.platform.b2b.model.PurchasePaymethod;
+import com.uas.platform.b2b.service.PurchasePaymethodService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.uas.platform.b2b.model.PurchasePaymethod;
-import com.uas.platform.b2b.service.PurchasePaymethodService;
-
+/**
+ * 付款方式
+ *
+ * @author hejq
+ */
 @RestController
 @RequestMapping("/paymethod")
 public class PurchasePaymethodController {
@@ -18,7 +22,8 @@ public class PurchasePaymethodController {
 	/**
 	 * 获取上次的付款方式
 	 * 
-	 * @return
+	 * @return PurchasePaymethod
+     * @see PurchasePaymethod
 	 */
 	@RequestMapping(value = "/method", method = RequestMethod.GET)
 	private PurchasePaymethod getMethod() {

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

@@ -49,7 +49,8 @@ import java.util.Map;
 /**
  * 招标单
  *
- * Created by dongbw on 17/03/07 14:19.
+ * @author dongbw
+ * @date 17/03/07 14:19
  */
 @SuppressWarnings("deprecation")
 @Controller
@@ -75,7 +76,7 @@ public class PurchaseTenderController {
      */
     @RequestMapping(value = "/publish/new", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional
+    @Transactional(rollbackFor = RuntimeException.class)
     public ResponseEntity<String> publishTender(String tender, String enInfos) throws Exception {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (null != enInfos) {
@@ -101,7 +102,7 @@ public class PurchaseTenderController {
      */
     @RequestMapping(value = "/save/new", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional
+    @Transactional(rollbackFor = RuntimeException.class)
     public ResponseEntity<String> saveTender(String tender, String enInfos) throws Exception {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (null != enInfos) {
@@ -313,7 +314,6 @@ public class PurchaseTenderController {
         return searchService.searchSaleTenderIds(keyword, pageParams);
     }
 
-
     /**
      * 作为供应商，查看收到的招标单（待投标）
      *
@@ -749,7 +749,8 @@ public class PurchaseTenderController {
     @Transactional
     public ResponseEntity<String> updateSavedTender(String tender, String enInfos) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        if (purchaseTender.getIfOpen() == Constant.YES) { // 开放时进另外的方法
+        // 开放时进另外的方法
+        if (purchaseTender.getIfOpen() == Constant.YES) {
             purchaseTenderService.updateSavedOpen(purchaseTender);
         } else {
             if (null != enInfos) {
@@ -824,13 +825,13 @@ public class PurchaseTenderController {
         ModelMap map = new ModelMap();
         String fileName = uploadItem.getFile().getOriginalFilename();
         String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-        InputStream is = null;
-        Workbook workbook = null;
+        InputStream is;
+        Workbook workbook ;
         try {
             is = uploadItem.getFile().getInputStream();
-            if ("xls".equals(suffix)) {
+            if (JxlsExcelView.EXCEL_XLS.equals(suffix)) {
                 workbook = new HSSFWorkbook(is);
-            } else if ("xlsx".equals(suffix)) {
+            } else if (JxlsExcelView.EXCEL_XLSX.equals(suffix)) {
                 workbook = new XSSFWorkbook(is);
             } else {
                 throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");

src/main/java/com/uas/platform/b2b/core/util/CosineSimilarityAlgorithm.java

@@ -7,7 +7,8 @@ import java.util.Map;
 
 /**
  * 余弦相似度算法，比较两个字符串的相似度
- * 
+ *
+ * @author yingp
  */
 public class CosineSimilarityAlgorithm {
 	/**

src/main/java/com/uas/platform/b2b/core/util/SqlDateFormdateUtils.java

@@ -1,22 +0,0 @@
-package com.uas.platform.b2b.core.util;
-
-import java.text.SimpleDateFormat;
-
-/**
- * 数据库时间格式
- *
- * @author hejq
- * @date 2018-08-07 11:39
- */
-public class SqlDateFormdateUtils {
-
-    /**
-     * 数据库 date 字段格式
-     */
-    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
-
-    /**
-     * 数据库 datetime 字段格式
-     */
-    public static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-}

src/main/java/com/uas/platform/b2b/dao/PagingReleaseDetailDao.java

@@ -3,39 +3,16 @@ package com.uas.platform.b2b.dao;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.SQLException;
-import java.util.List;
 
 /**
- * Created by dongbw
+ * 消息推送
+ *
  * 17/03/23 9:39.
+ * @author dongbw
  */
 @Repository
 public interface PagingReleaseDetailDao extends JpaRepository<PagingReleaseDetail, Long>,JpaSpecificationExecutor<PagingReleaseDetail> {
 
-    /**
-     * 获得未读消息的单据id
-     *
-     * @param vendUseruu
-     * @param venduu
-     * @return
-     */
-    @Query("select p.sourceId from PagingRelease p, PagingReleaseDetail d where p.id = d.pagingRelease.id and d.vendUserUU = :vendUseruu and d.vendUU = :venduu and d.readStatus = 0 and p.table = :table and p.category = :category")
-    List<Long> getUnreadIds(@Param("vendUseruu") Long vendUseruu, @Param("venduu") Long venduu, @Param("table") String table, @Param("category") String category);
-
-    /**
-     * 将消息设置成已推送
-     *
-     * @param ids
-     */
-    @Modifying
-    @Transactional(rollbackFor = SQLException.class)
-    @Query("update PagingReleaseDetail o set o.pushStatus = 1 where o.id in :ids")
-    void setPushedByIds(@Param("ids") Object[] ids);
 }

src/main/java/com/uas/platform/b2b/erp/controller/CheckTransController.java

@@ -22,7 +22,8 @@ import java.util.List;
 /**
  * 针对每个数据传输进行数据传输验证（针对买家）
  *
- * Created by hejq on 2018-04-19.
+ * @author hejq
+ * @date 2018-04-19
  */
 @RequestMapping("/erp/buyer")
 @RestController

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseNotifyServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.platform.b2b.core.util.SqlDateFormdateUtils;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.dao.PurchaseNoticeDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.dao.SaleSendItemDao;
@@ -116,7 +116,7 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
                         if (notice.getOrderItem() != null && notice.getOrderItem().getLtinstock() != null) {
                             ltinStock = notice.getOrderItem().getLtinstock();
                         }
-                        existNotice.setWaiting(getNoticeWaiting(SqlDateFormdateUtils.DATE_FORMAT.format(notice.getDelivery()), ltinStock));
+                        existNotice.setWaiting(getNoticeWaiting(DateFormatUtils.DATE_FORMAT.format(notice.getDelivery()), ltinStock));
 					}
 					existNotice.setDelivery(notice.getDelivery());
 					notices.add(existNotice);

src/main/java/com/uas/platform/b2b/mobile/controller/MobileTaskController.java

@@ -1,5 +1,10 @@
 package com.uas.platform.b2b.mobile.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.mobile.service.MobileTaskService;
+import com.uas.platform.b2b.model.OfficeTask;
+import com.uas.platform.b2b.model.OfficeTaskReply;
+import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -7,14 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2b.mobile.service.MobileTaskService;
-import com.uas.platform.b2b.model.OfficeTask;
-import com.uas.platform.b2b.model.OfficeTaskReply;
-import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
-
 /**
- * 
+ * 手机端消息推送信息
+ *
  * @author hejq
  * @time 创建时间：2017年3月17日
  */

src/main/java/com/uas/platform/b2b/model/PagingRelease.java

@@ -217,22 +217,6 @@ public class PagingRelease implements Serializable {
         this.enUU = enUU;
     }
 
-//    public EnterpriseInfo getEnterprise() {
-//        return enterprise;
-//    }
-//
-//    public void setEnterprise(EnterpriseInfo enterprise) {
-//        this.enterprise = enterprise;
-//    }
-//
-//    public User getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(User user) {
-//        this.user = user;
-//    }
-
     public Date getDate() {
         return date;
     }

src/main/java/com/uas/platform/b2b/model/PagingReleaseDetail.java

@@ -9,7 +9,9 @@ import java.util.Date;
 
 /**
  * 消息明细表
- * Created by dongbw on 17/03/22 14:55.
+ *
+ * @author dongbw
+ * @date 17/03/22 14:55
  */
 @Entity
 @Table(name = "purc$pagingreleasedetail")
@@ -32,13 +34,6 @@ public class PagingReleaseDetail implements Serializable{
     @NotNull
     private Long vendUserUU;
 
-//    /**
-//     * 采购单所属采购员
-//     */
-//    @OneToOne(cascade = { CascadeType.REFRESH })
-//    @JoinColumn(name = "prd_emuu", insertable = false, updatable = false)
-//    private UserBaseInfo vendUser;
-
     /**
      * 供应商企业UU
      */
@@ -125,14 +120,6 @@ public class PagingReleaseDetail implements Serializable{
         this.vendUserUU = vendUserUU;
     }
 
-//    public User getVendUser() {
-//        return vendUser;
-//    }
-//
-//    public void setVendUser(User vendUser) {
-//        this.vendUser = vendUser;
-//    }
-
     public Long getVendUU() {
         return vendUU;
     }
@@ -157,15 +144,6 @@ public class PagingReleaseDetail implements Serializable{
         this.vendUserName = vendUserName;
     }
 
-//    public EnterpriseInfo getVendor() {
-//        return vendor;
-//    }
-//
-//    public void setVendor(EnterpriseInfo vendor) {
-//        this.vendor = vendor;
-//    }
-
-
     public Short getReadStatus() {
         return readStatus;
     }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -1,8 +1,8 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
-import com.uas.platform.b2b.core.util.SqlDateFormdateUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
@@ -310,7 +310,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		if (!dateFormat.format(changItem.getNewDelivery()).equals(dateFormat.format(orderItem.getDelivery()))) {
             // 更新备料状态
             jdbcTemplate.execute("update purc$notice,purc$orderitems set is_waiting = PURC_NOTICE_WAIT_TO_SEND('"
-					+ SqlDateFormdateUtils.DATE_FORMAT.format(changItem.getNewDelivery()) + "', coalesce(pr_ltinstock, 0)) " +
+					+ DateFormatUtils.DATE_FORMAT.format(changItem.getNewDelivery()) + "', coalesce(pr_ltinstock, 0)) " +
 					"where pn_pdid = pd_id and pn_pdid = " + orderItem.getId());
             communalLogDao.save(new CommunalLog("更新发货提醒备料状态", "采购变更更新备料状态", "采购明细id： " + orderItem.getId(),
                     SystemSession.getUser().getEnterprise().getUu()));

src/main/java/com/uas/platform/b2b/service/impl/PurchasePaymethodServiceImpl.java

@@ -1,13 +1,15 @@
 package com.uas.platform.b2b.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.dao.PurchasePaymethodDao;
 import com.uas.platform.b2b.model.PurchasePaymethod;
 import com.uas.platform.b2b.service.PurchasePaymethodService;
 import com.uas.platform.b2b.support.SystemSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+/**
+ * @author US50
+ */
 @Service
 public class PurchasePaymethodServiceImpl implements PurchasePaymethodService {