From 667c18c338b807fb2ea6340db4e87ca0cb043be2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 11 May 2023 17:49:04 +0800
Subject: [PATCH] 责任人完成工作流任务逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 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..fe5fbfc 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,15 +1,19 @@
 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
@@ -22,13 +26,17 @@
 	}
 
 	@Override
-	public boolean save(PatrolReport entity) {
-		if (Func.equals(entity.getStatus(),1)){
+	@Transactional
+	public boolean updateById(PatrolReport patrolReport) {
+		PatrolRecord patrolRecord = new PatrolRecord();
+		patrolRecord.setId(Long.parseLong(patrolReport.getRecordId()));
+		//修改记录表中的异常状态为正常
+		patrolRecord.setStatus(1);
+		//修改记录表中的是否解决为已解决
+		patrolRecord.setSolution("1");
 
-		}
-
-
-
-		return super.save(entity);
+		boolean editRecord = patrolRecordService.updateById(patrolRecord);
+		boolean editReport = super.updateById(patrolReport);
+		return editRecord&&editReport;
 	}
 }

--
Gitblit v1.9.3