hbwri/skjcmanager.git

			@@ -5,6 +5,7 @@
			import cn.gistack.flow.core.feign.IFlowClient;
			import cn.gistack.flow.core.utils.FlowUtil;
			import cn.gistack.flow.core.utils.TaskUtil;
			import cn.gistack.nky.fegin.INkyClient;
			import cn.gistack.sm.patrol.entity.PatrolRecord;
			import cn.gistack.sm.patrol.entity.PatrolReport;
			import cn.gistack.sm.patrol.entity.PatrolTask;
			@@ -18,6 +19,7 @@
			import cn.gistack.sm.patrol.vo.PatrolTaskReport;
			import cn.gistack.sm.patrol.vo.PatrolTaskVO;
			import cn.gistack.sm.patrol.vo.TaskStatusCount;
			import cn.gistack.sm.sjztmd.service.IWaterDataTermitesService;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import lombok.AllArgsConstructor;
			import org.springblade.core.log.exception.ServiceException;
			@@ -46,6 +48,8 @@
			private final IFlowClient flowClient;
			private final IPatrolRecordService patrolRecordService;
			private final IPatrolReportService patrolReportService;
			private final INkyClient nkyClient;
			private final IWaterDataTermitesService waterDataTermitesService;

			/**
			* 自定义分页查询
			@@ -160,6 +164,15 @@
			//保存上报
			//停用
			// saveReport(patrolTask);


			//查监测预警表，看是否有这个任务，有的话修改任务状态
			Boolean finishDamTask = nkyClient.finishTask(patrolTask.getId().toString());
			if (!finishDamTask){
			//查白蚁表，看是否有这个任务，有的话修改任务状态
			Boolean finishTermitesTask = waterDataTermitesService.finishTask(patrolTask.getId().toString());
			}

			return baseMapper.updateById(patrolTask) >0;
			}else {
			return false;