控件校验相关修改。
This commit is contained in:
+12
@@ -1467,6 +1467,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
|||||||
String configData = "";
|
String configData = "";
|
||||||
List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
|
List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
|
||||||
|
|
||||||
|
// 匿名比较器排序
|
||||||
|
Collections.sort(paramsReportConfigDataEOS, new Comparator<ParamsReportConfigDataEO>() {
|
||||||
|
@Override
|
||||||
|
public int compare(ParamsReportConfigDataEO p1, ParamsReportConfigDataEO p2) {
|
||||||
|
if(p2.getOrderNum() == null || p1.getOrderNum() == null){
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
// 倒序
|
||||||
|
return p2.getOrderNum().compareTo(p1.getOrderNum());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData()))
|
String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData()))
|
||||||
.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); // 整合文本数据
|
.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); // 整合文本数据
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user