From 56c84cd7fb04407536eb0135162313029828a81f Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 11 十二月 2023 10:14:41 +0800
Subject: [PATCH] 暂时提交
---
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java | 2 +-
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java | 2 +-
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java | 2 +-
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java | 3 ++-
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java | 2 +-
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 12 ++++++------
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java | 2 +-
7 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
index bc62b95..5cfdac0 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -21,7 +22,7 @@
/**
* 上报数据-修改待上报
*/
- int updateReportStatus(HandlerCJReportParam handlerReportParam);
+ int updateReportStatus(HandlerReportParam handlerReportParam);
/**
* 上报数据-修改待上报-通过id
*/
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
index 1356a70..8d6432e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
@@ -29,7 +29,7 @@
/**
* 修改上报状态
* */
- int updateEventReportStatus(HandlerCJReportParam handlerReportParam);
+ int updateEventReportStatus(HandlerReportParam handlerReportParam);
/**
* 修改上报状态-通过id
* */
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
index 22e67b8..3129161 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -213,7 +213,7 @@
handlerReportParam.setId(riskAnaUnit.getId());
handlerReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
handlerReportParam.setReportTime(date);
- CJRiskAnaUnitService.updateReportStatus(handlerReportParam);
+ CJRiskAnaUnitService.updateCJReportStatusById(handlerReportParam);
idTextBuffer.append(riskAnaUnit.getId() + ";");
}
}else {
@@ -291,7 +291,7 @@
handlerReportParam.setId(cjEvent.getId());
handlerReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
handlerReportParam.setReportTime(date);
- CJEventService.updateEventReportStatus(handlerReportParam);
+ CJEventService.updateCJReportStatusById(handlerReportParam);
}
logger.info("【2】安全风险事件-数据处理完成");
}else {
@@ -369,7 +369,7 @@
handlerReportParam.setId(cjMeasure.getId());
handlerReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
handlerReportParam.setReportTime(date);
- CJMeasureService.updateMeasureReportStatus(handlerReportParam);
+ CJMeasureService.updateCJReportStatusById(handlerReportParam);
}
logger.info("【3】风险管控措施-数据处理完成");
}else {
@@ -448,7 +448,7 @@
handlerReportParam.setId(cjTaskFromWork.getId());
handlerReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
handlerReportParam.setReportTime(date);
- CJTaskFromWorkService.updateWorkReportStatus(handlerReportParam);
+ CJTaskFromWorkService.updateCJReportStatusById(handlerReportParam);
}
logger.info("【4】任务-数据处理完成");
@@ -529,7 +529,7 @@
handlerReportParam.setId(cjRecordFromTask.getId());
handlerReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
handlerReportParam.setReportTime(date);
- CJTaskRecordService.updateTaskReportStatus(handlerReportParam);
+ CJTaskRecordService.updateCJReportStatusById(handlerReportParam);
}
logger.info("【5】任务记录-数据处理完成");
}else {
@@ -613,7 +613,7 @@
handlerReportParam.setId(cjDangerInfo.getId());
handlerReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
handlerReportParam.setReportTime(date);
- CJDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
+ CJDangerInfoService.updateCJReportStatusById(handlerReportParam);
}
logger.info("【6】隐患信息-数据处理完成");
}else {
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
index 02c0162..6428d5e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
@@ -24,7 +24,7 @@
/**
* 上报数据-修改待上报
*/
- void updateReportStatus(HandlerCJReportParam handlerReportParam);
+ void updateReportStatus(HandlerReportParam handlerReportParam);
/**
* 上报数据-修改待上报-通过id
*/
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
index 9e46ad6..05ff260 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
@@ -24,7 +24,7 @@
/**
* 修改上报状态
* */
- int updateEventReportStatus(HandlerCJReportParam handlerReportParam);
+ int updateEventReportStatus(HandlerReportParam handlerReportParam);
/**
* 修改上报状态-通过id
* */
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
index b202d8c..f5aef0d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
@@ -52,7 +52,7 @@
* 上报数据-修改待上报
*/
@Override
- public void updateReportStatus(HandlerCJReportParam handlerReportParam) {
+ public void updateReportStatus(HandlerReportParam handlerReportParam) {
int result = preventCJReportRiskAnaUnitRepository.updateReportStatus(handlerReportParam);
if (result < 1){
throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
index 66b315d..07dd7fc 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
@@ -53,7 +53,7 @@
* 修改上报状态
* */
@Override
- public int updateEventReportStatus(HandlerCJReportParam handlerReportParam) {
+ public int updateEventReportStatus(HandlerReportParam handlerReportParam) {
int result = preventCJReportRiskEventRepository.updateEventReportStatus(handlerReportParam);
if (result < 1){
throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败");
--
Gitblit v1.9.2