ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 根据任务id查询草稿

Browse Source
This commit is contained in:
lijiarao
2024-01-10 15:50:34 +08:00
parent 9e6fcdcce0
commit 6b27cd199f
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java
+3 -1
View File
@@ -83,7 +83,9 @@ public interface IProcessHandleService {
**/
String getDefinitionIdByKey(String definitionKey);
ProcessInfoVO getDraft(String draftId);
ProcessInfoVO getDraftByDraftId(String draftId);
ProcessInfoVO getDraftByTaskId(String taskId);
/**
* @Author: liao
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+16 -3
View File
@@ -30,6 +30,7 @@ import org.activiti.engine.runtime.Execution;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -373,11 +374,16 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
}
@Override
public ProcessInfoVO getDraft(String draftId) {
public ProcessInfoVO getDraftByDraftId(String draftId) {
LambdaQueryWrapper<ProcessDraft> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
wrapper.eq(ProcessDraft::getId, draftId);
ProcessDraft processDraft = processDraftService.getOne(wrapper);
return generateProcessInfoByDraft(processDraft);
}
@NotNull
private ProcessInfoVO generateProcessInfoByDraft(ProcessDraft processDraft) {
ProcessInfoVO processInfoVO = new ProcessInfoVO();
BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
@@ -392,8 +398,6 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
basicTaskInfoDTO.setTaskId(processDraft.getTaskId()) ; // 任务id
basicTaskInfoDTO.setHandleText(processDraft.getHandleText()) ; // 流程审批信息-备注
basicTaskInfoDTO.setHandleFile(processDraft.getHandleFile()) ; // 流程审批信息-附件
processDraft.getUserId(); // 用户id
processInfoVO.setDraftId(draftId);
processInfoVO.setInfoJsonStr(processDraft.getInfoJsonStr()) ;//草稿信息json字符串
processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO);
@@ -401,6 +405,15 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
return processInfoVO;
}
@Override
public ProcessInfoVO getDraftByTaskId(String taskId) {
LambdaQueryWrapper<ProcessDraft> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
wrapper.eq(ProcessDraft::getTaskId, taskId);
ProcessDraft processDraft = processDraftService.getOne(wrapper);
return processDraft != null ? generateProcessInfoByDraft(processDraft) : null;
}
/**
* @Author: liao
* @Date: 2023/11/9 16:46
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+5 -1
View File
@@ -116,7 +116,11 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
public ProcessInfoVO<ProcessProjectAssessVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
if (StringUtils.isNotBlank(draftId) && StringUtils.isBlank(taskId)) {
ProcessInfoVO draft = processHandleService.getDraft(draftId);
ProcessInfoVO draft = processHandleService.getDraftByDraftId(draftId);
return draft;
}
ProcessInfoVO draft = processHandleService.getDraftByTaskId(taskId);
if (draft != null){
return draft;
}
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId);
laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+5 -3
View File
@@ -17,7 +17,6 @@ import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
import com.jero.modules.activiti.process.fb.dto.ProcessDTO;
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.projectassess.common.ProcessProjectAssessCommon;
import com.jero.modules.activiti.process.projectnotmet.common.ProcessProjectNotMetCommon;
import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet;
import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink;
@@ -31,7 +30,6 @@ import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
import org.activiti.engine.TaskService;
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -64,7 +62,11 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
public ProcessInfoVO<ProcessProjectNotMetVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
if (StringUtils.isNotBlank(draftId) && StringUtils.isBlank(taskId)) {
ProcessInfoVO draft = processHandleService.getDraft(draftId);
ProcessInfoVO draft = processHandleService.getDraftByDraftId(draftId);
return draft;
}
ProcessInfoVO draft = processHandleService.getDraftByTaskId(taskId);
if (draft != null){
return draft;
}
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId);