相关的格式的调整

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

@@ -99,7 +99,7 @@ public class PublicInquiryController {
     @RequestMapping(value = "/quotation", method = RequestMethod.GET)
     public List<InquiryDetail> getReply(Long enuu) {
         List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
-        logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enuu, "ERP");
+        logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enuu, InquirySource.ERP.name());
         return details;
     }
 
@@ -114,7 +114,7 @@ public class PublicInquiryController {
     @RequestMapping(value = "/reply/back", method = RequestMethod.POST)
     public void onReplySuccess(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
-        logger.log("公共询价", "ERP获取报价信息返回id", "id: " + idArray, Constant.UU, enuu, "ERP");
+        logger.log("公共询价", "ERP获取报价信息返回id", "id: " + idArray, Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyUploadSuccess(idArray);
     }
 
@@ -129,7 +129,7 @@ public class PublicInquiryController {
     public void checkInquiry(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
         List<Inquiry> inquiries = JSONObject.parseArray(jsonStr, Inquiry.class);
-        logger.log("公共询价", "ERP提交报价信息应用禁止报价", "size: " + inquiries.size(), Constant.UU, enuu, "ERP");
+        logger.log("公共询价", "ERP提交报价信息应用禁止报价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.updateInquiryStatus(inquiries);
     }
 
@@ -144,7 +144,7 @@ public class PublicInquiryController {
     public void onReplyDecide(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
         List<InquiryDecide> decides = JSONObject.parseArray(jsonStr, InquiryDecide.class);
-        logger.log("公共询价", "ERP针对供应报价信息进行（不）采纳操作", "size: " + decides.size(), Constant.UU, enuu, "ERP");
+        logger.log("公共询价", "ERP针对供应报价信息进行（不）采纳操作", "size: " + decides.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyDecide(decides, enuu);
     }
 
@@ -160,7 +160,7 @@ public class PublicInquiryController {
     public void onReplyInvalid(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
         String jsonStr = URLDecoder.decode(data, "UTF-8");
         List<Inquiry> inquiries = JSONObject.parseArray(jsonStr, Inquiry.class);
-        logger.log("公共询价", "ERP作废公共询价单返回数据到公共服务", "size: " + inquiries.size(), Constant.UU, enuu, "ERP");
+        logger.log("公共询价", "ERP作废公共询价单返回数据到公共服务", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
         publicInquiryService.onReplyInvalid(inquiries, enuu);
     }
 
@@ -318,7 +318,7 @@ public class PublicInquiryController {
             pageInfo = publicInquiryService.covert(pageInfo, _state);
         }
         logger.log("公共询价", "查询已转报价询价列表信息", "状态: " + _state == null ? "all" : _state, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
-        return  publicInquiryService.findByPageInfo(pageInfo, searchFilter);
+        return publicInquiryService.findByPageInfo(pageInfo, searchFilter);
     }
 
     /**
@@ -340,7 +340,7 @@ public class PublicInquiryController {
         if (null != _state) {
             pageInfo = publicInquiryService.covert(pageInfo, _state);
         }
-        return  publicInquiryService.findListByPageInfo(pageInfo, searchFilter);
+        return publicInquiryService.findListByPageInfo(pageInfo, searchFilter);
     }
 
     /**

src/main/java/com/uas/ps/inquiry/entity/OrderStatus.java

@@ -5,7 +5,7 @@ package com.uas.ps.inquiry.entity;
  *
  * Created by hejq on 2018-01-20.
  */
-public enum  OrderStatus {
+public enum OrderStatus {
 
     /**
      * 待处理

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

@@ -351,7 +351,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     purcInquiry.setShip(address);
                     Set<PurcInquiryItem> purcInquiryItems = new HashSet<PurcInquiryItem>();
                     if (!CollectionUtils.isEmpty(inquiry.getInProducts())) {
-                        for(BatchInProduct batch : inquiry.getInProducts()) {
+                        for (BatchInProduct batch : inquiry.getInProducts()) {
                             PurcInquiryItem item = new PurcInquiryItem();
                             item.setIsOpen(Constant.YES);
                             List<Product> products = productDao.findByEnUUAndCode(enuu, batch.getBip_prodcode());
@@ -483,8 +483,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      */
     @Override
     public void updateInquiryStatus(List<Inquiry> inquiries) {
-        if(!CollectionUtils.isEmpty(inquiries)) {
-            for(Inquiry inquiry : inquiries) {
+        if (!CollectionUtils.isEmpty(inquiries)) {
+            for (Inquiry inquiry : inquiries) {
                 // 更新为过期状态，不能进行报价处理
                 String sql = "update purc$puinquiryitems set id_overdue = 1 where id_inid in ( select in_id from purc$puinquiry where in_enuu = "
                         + inquiry.getEn_uu() + " and in_code = '" + inquiry.getIn_code() + "')";