From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 665692a..7f12e89 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,17 +1,40 @@
 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;
 
 @Service
+@AllArgsConstructor
 public class PatrolReportServiceImpl  extends BaseServiceImpl<PatrolReportMapper, PatrolReport> implements IPatrolReportService {
+	private final IPatrolRecordService patrolRecordService;
+
 	@Override
 	public IPage<PatrolConfig> selectPatrolReport(IPage<PatrolReport> page, PatrolConfig patrolConfig) {
 		return null;
 	}
+
+	@Override
+	@Transactional
+	public boolean updateById(PatrolReport patrolReport) {
+		PatrolRecord patrolRecord = new PatrolRecord();
+		patrolRecord.setId(Long.parseLong(patrolReport.getRecordId()));
+		//修改记录表中的是否解决为已解决
+		patrolRecord.setSolution("1");
+
+		boolean editRecord = patrolRecordService.updateById(patrolRecord);
+		boolean editReport = super.updateById(patrolReport);
+		return editRecord&&editReport;
+	}
 }

--
Gitblit v1.9.3