|
|
@@ -53,6 +53,7 @@ import org.activiti.engine.RuntimeService;
|
|
|
import org.activiti.engine.history.HistoricTaskInstance;
|
|
|
import org.activiti.engine.history.HistoricTaskInstanceQuery;
|
|
|
import org.activiti.engine.runtime.ProcessInstance;
|
|
|
+import org.activiti.engine.task.Task;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -753,8 +754,19 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
|
|
|
// 设置意见
|
|
|
projectRecords.getAct().setComment(comment);
|
|
|
projectRecords.preUpdate();
|
|
|
- // 提交流程任务
|
|
|
- actTaskService.complete(projectRecords.getAct().getTaskId(), projectRecords.getAct().getProcInsId(), projectRecords.getAct().getComment(), vars);
|
|
|
+ //判断是否是审核通过
|
|
|
+ if("yes".equals(projectRecords.getAct().getFlag())){
|
|
|
+ actTaskService.complete(projectRecords.getAct().getTaskId(), projectRecords.getAct().getProcInsId(), projectRecords.getAct().getComment(), vars);
|
|
|
+ }else{
|
|
|
+ //不通过需要查询审核组角色id
|
|
|
+ List<Act> list2 = actTaskService.toMyStartedList(projectRecords.getProcessInstanceId());
|
|
|
+ // 提交流程任务
|
|
|
+ //如果是驳回，并且审核角色为多个，需要对每个角色的审核流都进行处理
|
|
|
+ for (Act actInfo: list2) {
|
|
|
+ actTaskService.complete(actInfo.getTask().getId(), actInfo.getProcInsId(), projectRecords.getAct().getComment(), vars);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //actTaskService.complete(projectRecords.getAct().getTaskId(), projectRecords.getAct().getProcInsId(), projectRecords.getAct().getComment(), vars);
|
|
|
boolean state = actTaskService.isProcessEnd(projectRecords.getAct().getProcInsId());
|
|
|
List<User> users = new ArrayList<>();
|
|
|
List<User> userList = new ArrayList<>();
|
user5