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

处理代码合并问题

Browse Source
This commit is contained in:
zhn
2022-12-28 16:38:34 +08:00
parent b05f2bf3c9
commit f67172f4f0
4 changed files with 1 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/controller/ParamsExportTemplateEOController.java
-1
View File
@@ -188,7 +188,6 @@ public class ParamsExportTemplateEOController extends JeroController<ParamsExpor
return page; return page;
} }
/**
private String getRegion(ParamsExportTemplateEO paramsExportTemplateEO, List<DictModel> regionList, ParamsExportTemplateEO exportTemplateEO) { private String getRegion(ParamsExportTemplateEO paramsExportTemplateEO, List<DictModel> regionList, ParamsExportTemplateEO exportTemplateEO) {
//适用地区 //适用地区
List<DictModel> dictModelList = new ArrayList<>(); List<DictModel> dictModelList = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
-1
View File
@@ -98,7 +98,6 @@ public class ParamsExportTemplateEO implements Serializable {
private String orderByField; // 字段 private String orderByField; // 字段
//适用地区 //适用地区
private String region;
@TableField(exist = false) @TableField(exist = false)
private String regionName; private String regionName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+1 -1
View File
@@ -406,7 +406,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//数据字典 //数据字典
List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll(); List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
//技术领域处理 //技术领域处理
treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList); treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList,sysDictItems);
log.info("二阶段消耗时间：" + (System.currentTimeMillis() - startTime)); log.info("二阶段消耗时间：" + (System.currentTimeMillis() - startTime));
this.dataDicDispose(dummyInventoryInfoEOList,dummyInventoryInfoEO.getCut()); this.dataDicDispose(dummyInventoryInfoEOList,dummyInventoryInfoEO.getCut());
log.info("三阶段消耗时间：" + (System.currentTimeMillis() - startTime)); log.info("三阶段消耗时间：" + (System.currentTimeMillis() - startTime));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
-1
View File
@@ -977,7 +977,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
result = attestationRankSort(orderBy,orderByField,result,list); result = attestationRankSort(orderBy,orderByField,result,list);
} }
} }
log.info("四阶段消耗时间：" + (System.currentTimeMillis() - startTime));
return result; return result;
} }