FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

本人意见显示在最上面

Browse Source
This commit is contained in:
yuezhihang
2021-08-03 14:44:09 +08:00
parent 6f654406fd
commit 2f12561caf
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java
+1
View File
@@ -9,4 +9,5 @@ public class DetAllStandDto {
String cid; String cid;
String userId; String userId;
String endTime; String endTime;
String Account;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java
+25 -9
View File
@@ -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.dao.SarPublicIdeaAllDao;
import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.entity.*;
import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; 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.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -53,11 +56,17 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
System.out.println("总页数" + userIPage.getPages()); System.out.println("总页数" + userIPage.getPages());
List<SarPublicIdeaAll> list = userIPage.getRecords(); List<SarPublicIdeaAll> list = userIPage.getRecords();
List<SarPublicIdeaAllSUD> list1 = new ArrayList<>(); List<SarPublicIdeaAllSUD> list1 = new ArrayList<>();
list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); List<SarPublicIdeaAllSUD> partTwo = new ArrayList<>();
// for (SarPublicIdeaAllSUD sud:list1){ list.forEach(sarPublicIdeaAll -> {
// if (Time.compareTo(new Date())>=0)sud.setIdeaKey(0); SarPublicIdeaAllSUD sarPublicIdeaAllSUD=new SarPublicIdeaAllSUD();
// else {sud.setIdeaKey(1);} BeanUtils.copyProperties(sarPublicIdeaAll,sarPublicIdeaAllSUD);
// } if (sarPublicIdeaAll.getUserId().equals(detAllStandDto.getUserId())){
list1.add(sarPublicIdeaAllSUD);
}else {
partTwo.add(sarPublicIdeaAllSUD);
}
});
list1.addAll(partTwo);
IPage<SarPublicIdeaAllSUD> userIPage1 = new Page<>(); IPage<SarPublicIdeaAllSUD> userIPage1 = new Page<>();
userIPage1.setPages(userIPage.getPages()); userIPage1.setPages(userIPage.getPages());
userIPage1.setSize(userIPage.getSize()); userIPage1.setSize(userIPage.getSize());
@@ -74,10 +83,17 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
System.out.println("总页数" + userIPage.getPages()); System.out.println("总页数" + userIPage.getPages());
List<SarPublicIdeaAll> list = userIPage.getRecords(); List<SarPublicIdeaAll> list = userIPage.getRecords();
List<SarPublicIdeaAllSUD> list1 = new ArrayList<>(); List<SarPublicIdeaAllSUD> list1 = new ArrayList<>();
list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); List<SarPublicIdeaAllSUD> partTwo = new ArrayList<>();
// for (SarPublicIdeaAllSUD sud:list1){ list.forEach(sarPublicIdeaAll -> {
// sud.setIdeaKey(0); 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<SarPublicIdeaAllSUD> userIPage1 = new Page<>(); IPage<SarPublicIdeaAllSUD> userIPage1 = new Page<>();
userIPage1.setPages(userIPage.getPages()); userIPage1.setPages(userIPage.getPages());
userIPage1.setSize(userIPage.getSize()); userIPage1.setSize(userIPage.getSize());