wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

评论的待办

This commit is contained in:
wangliwen 2022-06-23 20:33:03 +08:00
parent da8340d41e
commit 1531d85695
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

@ -10,6 +10,8 @@ import io.renren.common.utils.MessageUtils;
import io.renren.modules.activiti.dto.TaskDTO; import io.renren.modules.activiti.dto.TaskDTO;
import io.renren.modules.demanData.dto.TDemandDataDTO; import io.renren.modules.demanData.dto.TDemandDataDTO;
import io.renren.modules.demanData.service.TDemandDataService; import io.renren.modules.demanData.service.TDemandDataService;
import io.renren.modules.demandComment.dto.TDemandCommentDTO;
import io.renren.modules.demandComment.service.TDemandCommentService;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.processForm.service.TAbilityApplicationService;
import io.renren.modules.resource.dto.ResourceDTO; import io.renren.modules.resource.dto.ResourceDTO;
@ -62,6 +64,9 @@ public class ActTaskService extends BaseServiceImpl {
public static String Task_HANDLE_STATE_BACK = "back"; //回退 public static String Task_HANDLE_STATE_BACK = "back"; //回退
public static String Task_HANDLE_STATE_STOP = "stop"; //终止 public static String Task_HANDLE_STATE_STOP = "stop"; //终止
@Autowired
private TDemandCommentService tDemandCommentService;
@Autowired @Autowired
protected TaskService taskService; protected TaskService taskService;
@Autowired @Autowired
@ -166,6 +171,16 @@ public class ActTaskService extends BaseServiceImpl {
listDto.add(dto); listDto.add(dto);
continue; continue;
} }
TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandCommentDTO != null) {
Map<String, Object> variables = oMapper.convertValue(tDemandCommentDTO, Map.class);
processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables());
dto.setParams(processVariable);
listDto.add(dto);
continue;
}
} }
return new PageData<>(listDto, (int) taskQuery.count()); return new PageData<>(listDto, (int) taskQuery.count());
} }