Merge branch 'dev' into feature-enremind0604-liusw

src/main/java/com/uas/ps/inquiry/dao/PurcInquiryDao.java

@@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 公共询价临时表中间表数据库操作
  *
@@ -20,5 +22,5 @@ public interface PurcInquiryDao extends JpaRepository<PurcInquiry, Long>, JpaSpe
      * @param enuu 企业UU
      * @return
      */
-    PurcInquiry findByCodeAndEnUU(String bi_code, Long enuu);
+    List<PurcInquiry> findByCodeAndEnUU(String bi_code, Long enuu);
 }

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

@@ -268,8 +268,8 @@ public class InquiryServiceImpl implements InquiryService {
     @Override
     public PurcInquiry saveInquiry(PurcInquiry currentInquiry) throws NotFoundException {
         //通过流水号和企业号找到公共询价单
-        PurcInquiry existInquiry = purcInquiryDao.findByCodeAndEnUU(currentInquiry.getCode(), currentInquiry.getEnUU());
-        if (null != existInquiry) {
+        List<PurcInquiry> existInquiryList = purcInquiryDao.findByCodeAndEnUU(currentInquiry.getCode(), currentInquiry.getEnUU());
+        if (!CollectionUtils.isEmpty(existInquiryList)) {
             throw new IllegalOperatorException("单号重复");
         } else {
             if (null != currentInquiry.getEnUU()) {

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

@@ -188,9 +188,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         if (!CollectionUtils.isEmpty(purcInquiries)) {
             for (PurcInquiry inquiry : purcInquiries) {
                 // 判断单号是否已存在
-                PurcInquiry old = purcInquiryDao.findByCodeAndEnUU(inquiry.getCode(), enuu);
+                List<PurcInquiry> old = purcInquiryDao.findByCodeAndEnUU(inquiry.getCode(), enuu);
                 List<PurcInquiryItem> items = new ArrayList<PurcInquiryItem>();
-                if (old == null && !CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
+                if (CollectionUtils.isEmpty(old) && !CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
                     for (PurcInquiryItem item : inquiry.getInquiryItems()) {
                         item.setInquiry(inquiry);
                         items.add(item);
@@ -515,9 +515,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         List<PurcInquiry> purcInquiries = new ArrayList<PurcInquiry>();
         if (!CollectionUtils.isEmpty(inquiries)) {
             for (BatchInquiry inquiry : inquiries) {
-                PurcInquiry old = purcInquiryDao.findByCodeAndEnUU(inquiry.getBi_code(), enuu);
+                List<PurcInquiry> old = purcInquiryDao.findByCodeAndEnUU(inquiry.getBi_code(), enuu);
                 //先判断是否已经存在,不存在才进行存储
-                if (null == old) {
+                if (CollectionUtils.isEmpty(old)) {
                     PurcInquiry purcInquiry = inquiry.covert();
                     purcInquiry.setEnUU(enuu);
                     purcInquiry.setShip(address);
@@ -590,8 +590,10 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     public void updateStatus(List<BatchInquiry> inquiries, Long enuu) {
         if (!CollectionUtils.isEmpty(inquiries)) {
             for (BatchInquiry inquiry : inquiries) {
-                PurcInquiry purcInquiry = purcInquiryDao.findByCodeAndEnUU(inquiry.getBi_code(), enuu);
-                purcInquiryItemDao.updateStatus(purcInquiry.getId());
+                List<PurcInquiry> purcInquiryList = purcInquiryDao.findByCodeAndEnUU(inquiry.getBi_code(), enuu);
+                for (PurcInquiry purcInquiry : purcInquiryList) {
+                    purcInquiryItemDao.updateStatus(purcInquiry.getId());
+                }
             }
         }
     }