From ec189a461b4e38c366e2dfbd2ae0f34e0a274f94 Mon Sep 17 00:00:00 2001
From: "@t2652009480" <2652009480@qq.com>
Date: Wed, 19 Jun 2024 18:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=8F=91=E8=A1=8C--=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8A=A5=E4=BB=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceImpl/InquiryIssuanceServiceImpl.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java
index 73aec06..6f0e95e 100644
--- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java
+++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java
@@ -344,7 +344,7 @@ public class InquiryIssuanceServiceImpl implements InquiryIssuanceService {
             inquiryParticipation1.setSecuritiesAccount(inquiryParticipation.getSecuritiesAccount());
             inquiryParticipation1.setCustodianSeat(inquiryParticipation.getCustodianSeat());
             inquiryParticipation1.setVoluntaryLockup(inquiryParticipation.getVoluntaryLockup());
-            inquiryParticipation.setRemark(inquiryParticipation.getRemark());
+            inquiryParticipation1.setRemark(inquiryParticipation.getRemark());
             inquiryParticipation1.setDeclarationPrice(inquiryParticipation.getDeclarationPrice());
             inquiryParticipation1.setIntendedSubscriptionQuantity(inquiryParticipation.getIntendedSubscriptionQuantity());
             inquiryParticipation1.setStatus("1");
@@ -358,23 +358,25 @@ public class InquiryIssuanceServiceImpl implements InquiryIssuanceService {
         PageHelper.startPage(size,index);
         //查询询价投资者列表
         AllotmentObjectExample allotmentObjectExample=new AllotmentObjectExample();
-        allotmentObjectExample.createCriteria().andFlowIdEqualTo(flowId).andLogicEqualTo(1);
+        allotmentObjectExample.createCriteria().andFlowIdEqualTo(flowId);
         List<AllotmentObject> allotmentObjects = allotmentObjectMapper.selectByExample(allotmentObjectExample);
         //查询报价列表
         InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample();
         inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId);
         List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
-        if(allotmentObjects.isEmpty() && inquiryParticipations.isEmpty()){
+        if(!inquiryParticipations.isEmpty()){
+            if(allotmentObjects.isEmpty()){
+                AllotmentObject allotmentObject=new AllotmentObject(flowId);
+                allotmentObjects.add(allotmentObject);
+            }
             List<PreliminaryStructureOfInquiryDTO> preliminaryStructureOfInquiryDTOS = convertUtil.entityToDTOList(inquiryParticipations, PreliminaryStructureOfInquiryDTO.class);
             for (int i = 0; i < inquiryParticipations.size(); i++) {
                 for (int j = 0; j < allotmentObjects.size(); j++) {
-                    if(inquiryParticipations.get(i).getAllotmentObjectCode()
-                            .equals(allotmentObjects.get(j).getAllotmentObjectCode())){
                         //查询投资者和配售对象名称并赋值
                         preliminaryStructureOfInquiryDTOS.get(i).setInvestorName(allotmentObjects.get(j).getInvestorName());
                         preliminaryStructureOfInquiryDTOS.get(i).setAllotmentObjectName(allotmentObjects.get(j).getAllotmentObjectName());
                     }
-                }
+
             }
             PageInfo<PreliminaryStructureOfInquiryDTO> pageInfo=new PageInfo<>(preliminaryStructureOfInquiryDTOS);
             return pageInfo;