kangwei :隐患排查详情缺少部分记录
正在显示
3 个修改的文件
包含
2 行增加
和
4 行删除
... | @@ -212,9 +212,9 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect | ... | @@ -212,9 +212,9 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect |
212 | List<DangerInspectionInfo> inspectionInfoList = dangerInspectionInfoMapper.selectList(queryWrapper); | 212 | List<DangerInspectionInfo> inspectionInfoList = dangerInspectionInfoMapper.selectList(queryWrapper); |
213 | 213 | ||
214 | if(inspectionInfoList != null && !inspectionInfoList.isEmpty()){ | 214 | if(inspectionInfoList != null && !inspectionInfoList.isEmpty()){ |
215 | LambdaQueryWrapper<DangerInspectionItem> queryItemWrapper = new LambdaQueryWrapper<DangerInspectionItem>(); | ||
216 | List<DangerInspectionItem> itemList = null; | 215 | List<DangerInspectionItem> itemList = null; |
217 | for( DangerInspectionInfo info : inspectionInfoList){ | 216 | for( DangerInspectionInfo info : inspectionInfoList){ |
217 | LambdaQueryWrapper<DangerInspectionItem> queryItemWrapper = new LambdaQueryWrapper<DangerInspectionItem>(); | ||
218 | queryItemWrapper.eq(DangerInspectionItem::getInspectionInfoId, info.getId()); | 218 | queryItemWrapper.eq(DangerInspectionItem::getInspectionInfoId, info.getId()); |
219 | queryItemWrapper.orderByAsc(DangerInspectionItem::getCreateTime ); | 219 | queryItemWrapper.orderByAsc(DangerInspectionItem::getCreateTime ); |
220 | 220 | ... | ... |
... | @@ -48,7 +48,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { | ... | @@ -48,7 +48,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { |
48 | List<WaterQualityMonitoringDetailVO> list = new ArrayList<>(); | 48 | List<WaterQualityMonitoringDetailVO> list = new ArrayList<>(); |
49 | Map<String, Object> monitorTagMap = new HashMap<String,Object>(); | 49 | Map<String, Object> monitorTagMap = new HashMap<String,Object>(); |
50 | QueryWrapper<SysMonitorMetricInfo> qw = new QueryWrapper<>(); | 50 | QueryWrapper<SysMonitorMetricInfo> qw = new QueryWrapper<>(); |
51 | qw.in("metric_uid_tag", "JSTP,JSTN,JSPH,JSNH3N,JSCOD,CSTP,CSTN,CSPH,CSNH3N,CSCOD".split(",")); //CSLL 出水瞬时流量() CSLJLL出水流量累计JSLL(JSLJLL) JSSS 进水浊度 CSSS 出水浊度 | 51 | qw.in("metric_uid_tag", "JSTP,JSTN,JSPH,JSNH3N,JSCOD,CSTP,CSTN,CSPH,CSNH3N,CSCOD,CSLL,JSLL,CSLJLL,JSLJLL,CSSS,JSSS".split(",")); //CSLL 出水瞬时流量() CSLJLL 出水流量累计JSLL(JSLJLL) JSSS 进水浊度 CSSS 出水浊度 |
52 | qw.eq("depart_id", departId); | 52 | qw.eq("depart_id", departId); |
53 | qw.groupBy("depart_id","metric_uid_tag"); | 53 | qw.groupBy("depart_id","metric_uid_tag"); |
54 | List<SysMonitorMetricInfo> monitorList = sysMonitorMetricInfoService.list(qw); | 54 | List<SysMonitorMetricInfo> monitorList = sysMonitorMetricInfoService.list(qw); | ... | ... |
... | @@ -27,8 +27,6 @@ public class OperationReportController { | ... | @@ -27,8 +27,6 @@ public class OperationReportController { |
27 | 27 | ||
28 | @Autowired | 28 | @Autowired |
29 | private IOperationReportService operationReportService; | 29 | private IOperationReportService operationReportService; |
30 | @Autowired | ||
31 | private IFCustomReportDatasetService fCustomReportDatasetService; | ||
32 | /** | 30 | /** |
33 | * 功能描述: 运营日报进出水初始化 | 31 | * 功能描述: 运营日报进出水初始化 |
34 | */ | 32 | */ | ... | ... |
-
请 注册 或 登录 后发表评论