hbwri/skjcmanager.git

			@@ -138,7 +138,7 @@

			@Override
			@Transactional
			public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId) {
			public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser) {
			R<BladeFlow> res = flowClient.getBladeFlow(patrolTask.getId().toString(),currentUserId);
			if (res.isSuccess()){
			BladeFlow flow = res.getData();
			@@ -152,7 +152,7 @@
			variables = Kv.create();
			}
			variables.put(ProcessConstant.REPORT_KEY,patrolTask.getReport());
			variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, "1650048152667467777"));
			variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
			// 完成任务
			flowClient.completeTask(taskId,processInstanceId,comment,variables);
			saveReport(patrolTask);
			@@ -165,13 +165,18 @@
			@Override
			public boolean chargeCompletePerson(BladeFlowTask bladeFlowTask) {
			//判断是否上报
			// boolean isReport = false;
			// List<PatrolReport> collect = bladeFlowTask.getPatrolReportList().stream().filter(report -> Func.equals(report.getStatus(), 2)).collect(Collectors.toList());
			// if (collect.size()>0){
			// isReport = true;
			// }
			// //更新report表
			// boolean update = patrolReportService.updateBatchById(bladeFlowTask.getPatrolReportList());

			boolean isReport = false;
			List<PatrolReport> collect = bladeFlowTask.getPatrolReportList().stream().filter(report -> Func.equals(report.getStatus(), 2)).collect(Collectors.toList());
			if (collect.size()>0){
			if (StringUtil.isNoneBlank(bladeFlowTask.getTaskUser())){
			isReport = true;
			}
			//更新report表
			boolean update = patrolReportService.updateBatchById(bladeFlowTask.getPatrolReportList());

			String taskId = bladeFlowTask.getTaskId();
			String processInstanceId = bladeFlowTask.getProcessInstanceId();
			@@ -191,7 +196,7 @@
			variables.put(ProcessConstant.TOTECH_KEY,bladeFlowTask.getToTech());
			//完成任务
			flowClient.completeTask(taskId, processInstanceId, comment, variables);
			return update;
			return true;
			}

			@Override