WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213

Browse Source
This commit is contained in:
高嵩
2023-02-17 17:16:11 +08:00
parent a6febe3e63 9840dd112d
commit 0d14076a58
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+17 -4
View File
@@ -594,10 +594,23 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
map.put("orderNum",4);
}else if(StringUtils.equals("description",dbFieldName)){
map.put("orderNum",5);
}else {
map.put("orderNum",orderNumStart);
orderNumStart ++;
}else if(StringUtils.equals("duty_territory",dbFieldName)){
map.put("orderNum",orderNumStart + 1);
}else if(StringUtils.equals("sdt",dbFieldName)){
map.put("orderNum",orderNumStart + 2);
}else if(StringUtils.equals("dre",dbFieldName)){
map.put("orderNum",orderNumStart + 3);
}else if(StringUtils.equals("version",dbFieldName)){
map.put("orderNum",orderNumStart + 4);
}else if(StringUtils.equals("sync_time",dbFieldName)){
map.put("orderNum",orderNumStart + 5);
}else if(StringUtils.equals("remarks",dbFieldName)){
map.put("orderNum",orderNumStart + 6);
}
// else {
// map.put("orderNum",orderNumStart);
// orderNumStart ++;
// }
if(StringUtils.equals(dbFieldName,"nio_number")
||StringUtils.equals(dbFieldName,"sdt")
@@ -618,7 +631,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
map.put("db_field_txt","Operator");
}
map.put("click4", true);
map.put("orderNum", orderNumStart);
map.put("orderNum", orderNumStart + 7);
list.add(map);
list = list.stream().sorted(