QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改拆分比对报错

Browse Source
This commit is contained in:
梁琦涛
2024-09-14 17:44:22 +08:00
parent d3f77b3101
commit 636555ff3e
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+14 -4
View File
@@ -26,6 +26,7 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.service.ISarFileSplitInfoService;
import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService;
import com.jero.modules.system.util.MyStringUtils; import com.jero.modules.system.util.MyStringUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -270,6 +271,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
private List<SarFileCompareItem> wrapperItemList(List<SarFileSplitItemsEO> list, String infoId, Map<String, SarFileCompareMenu> menuMap, String leftOrRight) { private List<SarFileCompareItem> wrapperItemList(List<SarFileSplitItemsEO> list, String infoId, Map<String, SarFileCompareMenu> menuMap, String leftOrRight) {
List<SarFileCompareItem> resList = new ArrayList<>(); List<SarFileCompareItem> resList = new ArrayList<>();
List<SarFileCompareItem> resNullList = new ArrayList<>();
for (SarFileSplitItemsEO itemsEO : list) { for (SarFileSplitItemsEO itemsEO : list) {
SarFileCompareItem item = new SarFileCompareItem(); SarFileCompareItem item = new SarFileCompareItem();
item.setInfoId(infoId); item.setInfoId(infoId);
@@ -277,15 +279,23 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
item.setMenuId(itemsEO.getMenuId()); item.setMenuId(itemsEO.getMenuId());
item.setItemsNum(itemsEO.getItemNum()); item.setItemsNum(itemsEO.getItemNum());
item.setItemsText(itemsEO.getItemContent()); item.setItemsText(itemsEO.getItemContent());
item.setLeftOrRight(leftOrRight);
item.setReviewed(CompareConst.NO_REVIEWED);
SarFileCompareMenu menu = menuMap.get(itemsEO.getMenuId()); SarFileCompareMenu menu = menuMap.get(itemsEO.getMenuId());
if (menu != null) { if (menu != null) {
item.setItemsDisplayNum(menu.getDisplaySeq()); item.setItemsDisplayNum(menu.getDisplaySeq());
resList.add(item);
}else{
resNullList.add(item);
} }
item.setLeftOrRight(leftOrRight);
item.setReviewed(CompareConst.NO_REVIEWED); }
resList.add(item); if(!CollectionUtils.isEmpty(resList)){
resList.stream().filter(o->!Objects.isNull(o.getItemsDisplayNum())).collect(Collectors.toList());
}
if(!CollectionUtils.isEmpty(resNullList)){
resList.addAll(resNullList);
} }
Collections.sort(resList, Comparator.comparingInt(SarFileCompareItem::getItemsDisplayNum));
return resList; return resList;
} }