TroubleAndRisk.git

			@@ -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());
			@@ -983,12 +982,12 @@
			if (checkUnit == null){
			throw new RuntimeException("基础检查点不存在");
			}
			System.out.println("通过一次检验");
			// System.out.println("通过一次检验");
			PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
			if (controlMeasure == null){
			throw new RuntimeException("管控措施已经被删除");
			}
			System.out.println("通过二次检验");
			// System.out.println("通过二次检验");
			//封装数据
			checkAndMeasure.setCheckId(hdcp.getCheckId());
			checkAndMeasure.setDangerCheckPointId(id);
			@@ -996,7 +995,7 @@
			checkAndMeasure.setControlMeasureId(controlMeasure.getId());
			checkAndMeasure.setCheckContent(controlMeasure.getCheckContent());
			checkAndMeasure.setCheckResult((byte) 4);
			System.out.println("数据封装完成");
			// System.out.println("数据封装完成");
			//写入核查任务检查点与管控措施信息
			int result = preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
			if (result <1){
			@@ -1038,6 +1037,12 @@

			String dangerInfoUuid = UUID.randomUUID().toString();
			PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
			// if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){
			// throw new RuntimeException("隐患来源为空");
			// }
			// if (ObjectUtils.isEmpty(hdcp.getHazardDangerType())){
			// throw new RuntimeException("隐患类型为空");
			// }

			dangerInfo.setUuid(dangerInfoUuid);
			dangerInfo.setDangerCheckPointId(id);
			@@ -1047,20 +1052,22 @@
			dangerInfo.setDangerReason(hdcp.getDangerReason());
			dangerInfo.setDangerResult(hdcp.getDangerResult());
			dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
			//隐患状态 0未验收 1验收通过 2验收未通过，新建时为空
			// if (ObjectUtils.isNotEmpty(hdcp.getsta))
			//隐患状态 0未验收 1验收通过 2验收未通过
			if (hdcp.getAcceptStatus() == null){
			//设置为空
			dangerInfo.setDangerState(null);
			} else if (hdcp.getAcceptStatus().equals(0)){
			dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
			} else if (hdcp.getAcceptStatus().equals("0")){
			//设置为整改中
			dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
			} else if (hdcp.getAcceptStatus().equals(1)) {
			} else if (hdcp.getAcceptStatus().equals("1")) {
			//设置为已验收
			dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
			}else if (hdcp.getAcceptStatus().equals(2)){
			}else if (hdcp.getAcceptStatus().equals("2")){
			//设置为超期未整改
			dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
			}
			// dangerInfo.setDangerState(null); //设置为空
			dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
			//获取上报主配置信息
			PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
			@@ -1082,8 +1089,8 @@
			//设置本条数据上报开关为-关闭
			dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
			}

			return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
			int result = preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
			return result;
			}

			/**
			@@ -1231,11 +1238,11 @@
			PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();

			dangerInfo.setDangerCheckPointId(hdcp.getId());

			int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus());
			//如果验收通过，设置为验收成功；验收失败，打回上一级进行整改，设置为整改中
			if (hdcp.getAcceptStatus().equals(0)){
			if (acceptStatus == 0){
			dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
			}else if (hdcp.getAcceptStatus().equals(1)){
			}else if (acceptStatus == 1){
			dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
			}

			@@ -1277,7 +1284,6 @@
			return listQueryRespDTOs;
			}


			/**
			* 管控措施-不分页查询
			*/
			@@ -1297,6 +1303,7 @@
			ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
			return resultVO;
			}

			/**
			* 通过排查点，查找管控措施id
			*/
			@@ -1304,6 +1311,7 @@
			public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {
			return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
			}

			/**
			* 查询管控措施信息
			*/
			@@ -1325,8 +1333,23 @@
			PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);
			return dangerInfobyHiddenDangerId;
			}

			@Override
			public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {
			return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());
			}










			// /**
			// * 全流程隐患上报-附属表信息插入
			// * 全流程隐患上报-附属表信息插入
			// * */
			// @Override
			// public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
			@@ -1368,4 +1391,6 @@
			//
			// return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
			// }


			}