From fb68bec953a3bbf5b252378cd348a424c87310fa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 12 Jun 2023 17:29:04 +0800
Subject: [PATCH] 巡查上报接口修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java | 12 +++++++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolReportService.java | 4 ++++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
index d8e8b5d..bb38672 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
@@ -63,7 +63,7 @@
@ApiOperation(value="巡查上报-批量编辑", notes="巡查上报-批量编辑")
@RequestMapping(value = "/editBatch", method = {RequestMethod.PUT,RequestMethod.POST})
public R editBatch(@RequestBody List<PatrolReport> list){
- return R.data(patrolReportService.updateBatchById(list));
+ return R.data(patrolReportService.customizeUpdateBatchById(list));
}
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolReportService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolReportService.java
index 4331ef1..921b483 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolReportService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolReportService.java
@@ -5,6 +5,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
public interface IPatrolReportService extends BaseService<PatrolReport> {
IPage<PatrolConfig> selectPatrolReport(IPage<PatrolReport> page, PatrolConfig patrolConfig);
+
+ Boolean customizeUpdateBatchById(List<PatrolReport> list);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java
index 7f12e89..9f78e55 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java
@@ -15,8 +15,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
@Service
@AllArgsConstructor
+@Transactional(rollbackFor = Exception.class)
public class PatrolReportServiceImpl extends BaseServiceImpl<PatrolReportMapper, PatrolReport> implements IPatrolReportService {
private final IPatrolRecordService patrolRecordService;
@@ -26,7 +29,14 @@
}
@Override
- @Transactional
+ public Boolean customizeUpdateBatchById(List<PatrolReport> list) {
+ list.forEach(report->{
+ updateById(report);
+ });
+ return true;
+ }
+
+ @Override
public boolean updateById(PatrolReport patrolReport) {
PatrolRecord patrolRecord = new PatrolRecord();
patrolRecord.setId(Long.parseLong(patrolReport.getRecordId()));
--
Gitblit v1.9.3