Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
a5cfef3e 由 谢超
选项

优化巡检分析的代码

1 个父辈 f952129e
内嵌 并排
正在显示 1 个修改的文件 包含 8 行增加 和 8 行删除
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/impl/InspectionAnalysisServiceImpl.java
...@@ -713,8 +713,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -713,8 +713,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
713 if (inspectionPointFillGroupIdList.size() > 0) { 713 if (inspectionPointFillGroupIdList.size() > 0) {
714 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>(); 714 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
715 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList); 715 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList);
716 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList); 716 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
717 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList); 717 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
718 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id"); 718 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
719 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", ""); 719 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
720 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id"); 720 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
...@@ -883,8 +883,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -883,8 +883,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
883 if (inspectionPointFillGroupIdList.size() > 0) { 883 if (inspectionPointFillGroupIdList.size() > 0) {
884 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>(); 884 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
885 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", tempInspectionTaskIdList); 885 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", tempInspectionTaskIdList);
886 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList); 886 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
887 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList); 887 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
888 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id"); 888 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
889 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", ""); 889 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
890 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id"); 890 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
...@@ -1172,8 +1172,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -1172,8 +1172,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
1172 if (inspectionPointFillGroupIdList.size() > 0) { 1172 if (inspectionPointFillGroupIdList.size() > 0) {
1173 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>(); 1173 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
1174 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList); 1174 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", inspectionTaskIdList);
1175 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList); 1175 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
1176 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList); 1176 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
1177 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id"); 1177 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
1178 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", ""); 1178 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
1179 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id"); 1179 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
...@@ -1321,8 +1321,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService ...@@ -1321,8 +1321,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
1321 if (inspectionPointFillGroupIdList.size() > 0) { 1321 if (inspectionPointFillGroupIdList.size() > 0) {
1322 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>(); 1322 QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
1323 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", tempInspectionTaskIdList); 1323 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_task_id", tempInspectionTaskIdList);
1324 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", inspectionPointFillGroupIdList); 1324 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_point_fill_group_id", new HashSet<>(inspectionPointFillGroupIdList));
1325 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",inspectionFillGroupIdList); 1325 inspectionTaskFillContentQueryWrapper.in("isfc.inspection_fill_group_id",new HashSet<>(inspectionFillGroupIdList));
1326 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id"); 1326 inspectionTaskFillContentQueryWrapper.isNotNull("itpfg.equip_info_id");
1327 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", ""); 1327 inspectionTaskFillContentQueryWrapper.ne("itpfg.equip_info_id", "");
1328 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id"); 1328 inspectionTaskFillContentQueryWrapper.groupBy("itpfg.equip_info_id");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!