From e3fded6dd62d9606edab192c98f9aca5177e95e0 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期一, 03 七月 2023 13:41:17 +0800 Subject: [PATCH] 上报修改完成-部分无数据测试 --- src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java index 78ca05c..54b89ea 100644 --- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java +++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java @@ -481,7 +481,6 @@ controlMeasure.setCreateByUserName(sysUser.getUserName()); controlMeasure.setRiskEventUuid(riskEvent.getUuid()); - //todo 对所属企业id和uuid没有进行设置 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode()); //设置上报时间为空 controlMeasure.setReportTime(null); @@ -815,7 +814,7 @@ jobAndMeasure.setJobId(jobId); jobAndMeasure.setJobUuid(jobUuid); jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId()); - jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//todo 如果删除了措施 此处可能为空,后续处理 + jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空,后续处理 //获取上报主配置信息 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode()); //设置上报时间为空 @@ -877,7 +876,7 @@ //使用保存下来的uuid,再次添加关联关系 jobAndMeasure.setJobUuid(jobUuid); jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId()); - jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//todo 如果删除了措施 此处可能为空,后续处理 + jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空,后续处理 //获取上报主配置信息 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode()); @@ -1278,7 +1277,6 @@ return listQueryRespDTOs; } - /** * 管控措施-不分页查询 */ @@ -1298,6 +1296,7 @@ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult); return resultVO; } + /** * 通过排查点,查找管控措施id */ @@ -1305,6 +1304,7 @@ public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) { return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId); } + /** * 查询管控措施信息 */ @@ -1342,7 +1342,7 @@ // /** -// * 全流程隐患上报-附属表信息插入 +// * 全流程 隐患上报-附属表信息插入 // * */ // @Override // public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) { -- Gitblit v1.9.2