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/service/impl/PatrolReportServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
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 667f30c..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
@@ -1,18 +1,25 @@
package cn.gistack.sm.patrol.service.impl;
import cn.gistack.sm.patrol.entity.PatrolConfig;
+import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolReport;
+import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.mapper.PatrolReportMapper;
import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.service.IPatrolReportService;
+import cn.gistack.sm.patrol.service.IPatrolTaskService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.utils.Func;
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;
@@ -22,13 +29,22 @@
}
@Override
- public boolean save(PatrolReport entity) {
- if (Func.equals(entity.getStatus(),1)){
+ 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()));
+ //修改记录表中的是否解决为已解决
+ patrolRecord.setSolution("1");
-
-
- return super.save(entity);
+ boolean editRecord = patrolRecordService.updateById(patrolRecord);
+ boolean editReport = super.updateById(patrolReport);
+ return editRecord&&editReport;
}
}
--
Gitblit v1.9.3