Browse Source

代码评审修改

dongbw 6 years ago
parent
commit
5d77bc4ede

+ 1 - 1
src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -98,7 +98,7 @@ public class InquiryForSaleController {
     public String addAttachs(@RequestBody Attach attach) throws Exception {
         long start = System.currentTimeMillis();
         log.info("/inquiry/sale/attach post, 卖家报价时上传附件信息,附件: {}", JSON.toJSON(attach));
-        attach = saleService.addAttachs(attach);
+        attach = saleService.addAttaches(attach);
         log.info("/inquiry/sale/attach post,  耗时: {}", (System.currentTimeMillis() - start));
         if (null != attach.getId()) {
             return JSONObject.toJSONString(attach);

+ 1 - 2
src/main/java/com/uas/ps/inquiry/service/InquiryForSaleService.java

@@ -4,7 +4,6 @@ import com.uas.ps.inquiry.domain.IPage;
 import com.uas.ps.inquiry.model.*;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
-import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 
 import java.util.List;
@@ -30,7 +29,7 @@ public interface InquiryForSaleService {
      * @param attach
      * @return
      */
-    Attach addAttachs(Attach attach);
+    Attach addAttaches(Attach attach);
 
     /**
      * 供应商保存报价信息

+ 9 - 9
src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -132,7 +132,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
      * @return
      */
     @Override
-    public Attach addAttachs(Attach attach) {
+    public Attach addAttaches(Attach attach) {
         return attachDao.save(attach);
     }
 
@@ -158,7 +158,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 item.getSourceId(), item.getInquiry().getId(),
                 item.getReplaceCmpCode(), item.getReplaceSpec(), item.getReplaceBrand(), item.getIsReplace());
         //回复清单更新
-        if(item.getReplies().size() > 0) {
+        if(!CollectionUtils.isEmpty(item.getReplies())) {
             for (PublicInquiryReply reply1 : item.getReplies()) {
                 jdbcTemplate.update("update public$inquiryreply set ir_idid = " + item.getId() + "where ir_id = " + reply1.getId());
             }
@@ -209,7 +209,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
      * @return
      */
     @Override
-    public PublicInquiryItem saveItem(PublicInquiryItem inquiryItem) throws Exception {
+    public PublicInquiryItem saveItem(PublicInquiryItem inquiryItem) {
         if (StringUtils.isEmpty(inquiryItem.getVendUU()) || StringUtils.isEmpty(inquiryItem.getVendUserUU())) {
             throw new com.uas.ps.core.page.exception.IllegalOperatorException("企业UU或用户UU不能为空");
         }
@@ -316,10 +316,9 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
 
     /**
      * 保存明细
-     * @param inquiry 主表信息
-     * @param inquiryItem 明细信息
-     * @return
-     * @throws Exception
+     * @param inquiry 报价主表信息
+     * @param inquiryItem 报价明细信息
+     * @return 报价单
      */
     private PublicInquiryItem saveInquiryItems(PublicInquiry inquiry, PublicInquiryItem inquiryItem) {
         long start = System.currentTimeMillis();
@@ -327,7 +326,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         setPublicInquiryItemWithInquiry(inquiry, inquiryItem);
 
         inquiryItem = infoDao.save(inquiryItem);
-        System.out.println("save publicInquiryItem耗时:" + (System.currentTimeMillis() - start));
+        log.info("save publicInquiryItem耗时:" + (System.currentTimeMillis() - start));
         start = System.currentTimeMillis();
 
         // 更新原表的报价条数
@@ -526,7 +525,8 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 throw new Exception("询价单已存在,不允许再次报价");
             } else {
                 inquiryItem.setInquiry(inquiry);
-                inquiryItem.setId(id);// 这里设置id是为了后面赋值来源id
+                // 这里设置id是为了后面赋值来源id
+                inquiryItem.setId(id);
                 inquiryItem.setOfferTime(new Date(System.currentTimeMillis()));
                 inquiryItem.setVendUU(enuu);
                 inquiryItem.setVendUserUU(useruu);