From 2f12561caf09064c91128052e7cee30afe45b13c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 3 Aug 2021 14:44:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E4=BA=BA=E6=84=8F=E8=A7=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E6=9C=80=E4=B8=8A=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/entity/DetAllStandDto.java | 1 + .../Impl/SarPublicIdeaAllServiceImpl.java | 34 ++++++++++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java index a7541e83..e0da9d35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -9,4 +9,5 @@ public class DetAllStandDto { String cid; String userId; String endTime; + String Account; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 484b8f86..7f34cc6c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -5,12 +5,15 @@ import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; +import com.adc.da.sys.entity.LoginInfoEO; +import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,11 +56,17 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl list = userIPage.getRecords(); List list1 = new ArrayList<>(); - list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); -// for (SarPublicIdeaAllSUD sud:list1){ -// if (Time.compareTo(new Date())>=0)sud.setIdeaKey(0); -// else {sud.setIdeaKey(1);} -// } + List partTwo = new ArrayList<>(); + list.forEach(sarPublicIdeaAll -> { + SarPublicIdeaAllSUD sarPublicIdeaAllSUD=new SarPublicIdeaAllSUD(); + BeanUtils.copyProperties(sarPublicIdeaAll,sarPublicIdeaAllSUD); + if (sarPublicIdeaAll.getUserId().equals(detAllStandDto.getUserId())){ + list1.add(sarPublicIdeaAllSUD); + }else { + partTwo.add(sarPublicIdeaAllSUD); + } + }); + list1.addAll(partTwo); IPage userIPage1 = new Page<>(); userIPage1.setPages(userIPage.getPages()); userIPage1.setSize(userIPage.getSize()); @@ -74,10 +83,17 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl list = userIPage.getRecords(); List list1 = new ArrayList<>(); - list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); -// for (SarPublicIdeaAllSUD sud:list1){ -// sud.setIdeaKey(0); -// } + List partTwo = new ArrayList<>(); + list.forEach(sarPublicIdeaAll -> { + SarPublicIdeaAllSUD sarPublicIdeaAllSUD=new SarPublicIdeaAllSUD(); + BeanUtils.copyProperties(sarPublicIdeaAll,sarPublicIdeaAllSUD); + if (sarPublicIdeaAll.getUserId().equals(detAllStandDto.getUserId())){ + list1.add(sarPublicIdeaAllSUD); + }else { + partTwo.add(sarPublicIdeaAllSUD); + } + }); + list1.addAll(partTwo); IPage userIPage1 = new Page<>(); userIPage1.setPages(userIPage.getPages()); userIPage1.setSize(userIPage.getSize());