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 allotmentObjects = allotmentObjectMapper.selectByExample(allotmentObjectExample); //查询报价列表 InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample(); inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId); List inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample); - if(allotmentObjects.isEmpty() && inquiryParticipations.isEmpty()){ + if(!inquiryParticipations.isEmpty()){ + if(allotmentObjects.isEmpty()){ + AllotmentObject allotmentObject=new AllotmentObject(flowId); + allotmentObjects.add(allotmentObject); + } List 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 pageInfo=new PageInfo<>(preliminaryStructureOfInquiryDTOS); return pageInfo;