project_management-java.git

			@@ -109,7 +109,7 @@
			@PostMapping("/complete/form/{taskId}")
			public AjaxResult completeSubmitForm(@ApiParam(value = "流程定义id") @PathVariable(value = "taskId") String taskId,
			@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
			return flowTaskService.completeSubmitForm(taskId, variables);
			return flowTaskService.completeSubmitForm(taskId, variables, Boolean.TRUE);
			}

			@ApiOperation(value = "完成审批任务")

			@@ -220,9 +220,10 @@
			*
			* @param taskId 任务id
			* @param variables 表单数据
			* @param addLog
			* @return
			*/
			AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables);
			AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog);

			/**
			* 查看任务

			@@ -24,7 +24,6 @@
			import com.ycl.domain.dto.FlowTaskDto;
			import com.ycl.domain.dto.FlowViewerDto;
			import com.ycl.domain.entity.ProcessCoding;
			import com.ycl.domain.entity.ProcessLog;
			import com.ycl.domain.entity.ProjectProcess;
			import com.ycl.domain.entity.SysForm;
			import com.ycl.domain.json.RejectData;
			@@ -76,7 +75,6 @@

			import java.io.InputStream;
			import java.lang.reflect.Field;
			import java.math.BigDecimal;
			import java.nio.charset.StandardCharsets;
			import java.util.*;
			import java.util.concurrent.ConcurrentHashMap;
			@@ -137,11 +135,12 @@
			*
			* @param taskId 任务id
			* @param variables 表单数据
			* @param addLog
			* @return
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables) {
			public AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog) {
			Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
			if (Objects.isNull(task)) {
			return AjaxResult.error("任务不存在");
			@@ -175,6 +174,7 @@
			taskService.complete(taskId, newV);
			}
			// 保存日志
			if (addLog) {
			publisher.publishEvent(new TaskLogEvent(this, null,
			SecurityUtils.getUserId(),
			projectProcess.getProjectId(),
			@@ -184,6 +184,7 @@
			task.getName(),
			ProcessLogEventTypeEnum.FINISHED,
			null));
			}
			return AjaxResult.success("提交成功");
			}

			@@ -3,7 +3,6 @@

			import com.alibaba.fastjson2.JSONArray;
			import com.alibaba.fastjson2.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
			import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
			@@ -738,7 +737,7 @@
			}
			}
			// 完成任务
			flowTaskService.completeSubmitForm(form.getTaskId(), data);
			flowTaskService.completeSubmitForm(form.getTaskId(), data, Boolean.FALSE);
			}
			return Result.ok("操作成功");
			}

	business/src/main/java/com/ycl/controller/FlowTaskController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	business/src/main/java/com/ycl/service/IFlowTaskService.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史