update 流程详情查询鉴权
This commit is contained in:
liao
+4
-3
@@ -38,11 +38,12 @@ public class ProcessFbEntryChangeController extends JeroController<ProcessFbEntr
|
||||
@AutoLog(value = "标准法规入库_变更流程-查询流程信息")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "draftId", value = "草稿id"),
|
||||
@ApiImplicitParam(name = "processInstanceId", value = "流程实例id")
|
||||
@ApiImplicitParam(name = "processInstanceId", value = "流程实例id"),
|
||||
@ApiImplicitParam(name = "taskId", value = "任务id")
|
||||
})
|
||||
@ApiOperation("标准法规入库_变更流程-查询流程信息")
|
||||
public Result<ProcessInfoVO<ProcessFbEntryChange>> queryProcessInfoVO(String draftId, String processInstanceId){
|
||||
ProcessInfoVO<ProcessFbEntryChange> processInfoVO = processFbEntryChangeService.queryProcessInfoVO(draftId, processInstanceId);
|
||||
public Result<ProcessInfoVO<ProcessFbEntryChange>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){
|
||||
ProcessInfoVO<ProcessFbEntryChange> processInfoVO = processFbEntryChangeService.queryProcessInfoVO(draftId, processInstanceId, taskId);
|
||||
return Result.OK(processInfoVO);
|
||||
}
|
||||
|
||||
|
||||
+4
-3
@@ -39,11 +39,12 @@ public class ProcessFbStandardPurchaseController extends JeroController<ProcessF
|
||||
@AutoLog(value = "法规采购流程表-查询流程信息")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "draftId", value = "草稿id"),
|
||||
@ApiImplicitParam(name = "processInstanceId", value = "流程实例id")
|
||||
@ApiImplicitParam(name = "processInstanceId", value = "流程实例id"),
|
||||
@ApiImplicitParam(name = "taskId", value = "任务id")
|
||||
})
|
||||
@ApiOperation("法规采购流程表-查询流程信息")
|
||||
public Result<ProcessInfoVO<List<ProcessFbStandardPurchase>>> queryProcessInfoVO(String draftId, String processInstanceId){
|
||||
ProcessInfoVO<List<ProcessFbStandardPurchase>> processInfoVO = processFbStandardPurchaseService.queryProcessInfoVO(draftId, processInstanceId);
|
||||
public Result<ProcessInfoVO<List<ProcessFbStandardPurchase>>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId){
|
||||
ProcessInfoVO<List<ProcessFbStandardPurchase>> processInfoVO = processFbStandardPurchaseService.queryProcessInfoVO(draftId, processInstanceId, taskId);
|
||||
return Result.OK(processInfoVO);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -58,5 +58,5 @@ public interface IProcessFbEntryChangeService extends IService<ProcessFbEntryCha
|
||||
* @Date: 2023/11/8 11:12
|
||||
* @Description: 查询流程信息
|
||||
**/
|
||||
ProcessInfoVO<ProcessFbEntryChange> queryProcessInfoVO(String draftId, String processInstanceId);
|
||||
ProcessInfoVO<ProcessFbEntryChange> queryProcessInfoVO(String draftId, String processInstanceId, String taskId);
|
||||
}
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ public interface IProcessFbStandardPurchaseService extends IService<ProcessFbSta
|
||||
* @Date: 2023/11/14 14:07
|
||||
* @Description: 查询流程信息
|
||||
**/
|
||||
ProcessInfoVO<List<ProcessFbStandardPurchase>> queryProcessInfoVO(String draftId, String processInstanceId);
|
||||
ProcessInfoVO<List<ProcessFbStandardPurchase>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId);
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
|
||||
+1
-1
@@ -95,7 +95,7 @@ public interface IProcessHandleService {
|
||||
* @Date: 2023/11/8 11:16
|
||||
* @Description: 查询流程信息
|
||||
**/
|
||||
ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId);
|
||||
ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId);
|
||||
|
||||
/**
|
||||
* @Author: liao
|
||||
|
||||
+2
-2
@@ -217,8 +217,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
|
||||
* @Description: 查询流程信息
|
||||
**/
|
||||
@Override
|
||||
public ProcessInfoVO<ProcessFbEntryChange> queryProcessInfoVO(String draftId, String processInstanceId) {
|
||||
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId);
|
||||
public ProcessInfoVO<ProcessFbEntryChange> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
|
||||
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId);
|
||||
ProcessFbEntryChange processFbEntryChange = getById(processInfoVO.getBusinessId());
|
||||
Map<String, Object> map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class);
|
||||
|
||||
|
||||
+8
-2
@@ -264,12 +264,18 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
|
||||
**/
|
||||
@Override
|
||||
public ProcessInfoVO<ProcessFbStandardConsultationVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
|
||||
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId);
|
||||
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId);
|
||||
ProcessFbStandardConsultationVO processFbStandardConsultationVO = new ProcessFbStandardConsultationVO();
|
||||
|
||||
ProcessFbStandardConsultation processFbStandardConsultation = getById(processInfoVO.getBusinessId());
|
||||
String businessId = processInfoVO.getBusinessId();
|
||||
ProcessFbStandardConsultation processFbStandardConsultation = getById(businessId);
|
||||
processFbStandardConsultationVO.setProcessFbStandardConsultation(processFbStandardConsultation); // 业务基本信息
|
||||
|
||||
LambdaQueryWrapper<ProcessFbConsultationList> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ProcessFbConsultationList::getBusinessId, businessId);
|
||||
List<ProcessFbConsultationList> consultationLists = processFbConsultationListService.list(queryWrapper);
|
||||
processFbStandardConsultationVO.setProcessFbConsultationLists(consultationLists);
|
||||
|
||||
processInfoVO.setBusinessInfoDTO(processFbStandardConsultationVO);
|
||||
return processInfoVO;
|
||||
}
|
||||
|
||||
+2
-2
@@ -54,8 +54,8 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
|
||||
* @Description: 查询流程信息
|
||||
**/
|
||||
@Override
|
||||
public ProcessInfoVO<List<ProcessFbStandardPurchase>> queryProcessInfoVO(String draftId, String processInstanceId) {
|
||||
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId);
|
||||
public ProcessInfoVO<List<ProcessFbStandardPurchase>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
|
||||
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId);
|
||||
|
||||
LambdaQueryWrapper<ProcessFbStandardPurchase> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, processInfoVO.getBusinessId());
|
||||
|
||||
+11
-1
@@ -331,7 +331,14 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
|
||||
* @Description: 查询流程信息
|
||||
**/
|
||||
@Override
|
||||
public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId) {
|
||||
public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
|
||||
if (StringUtils.isBlank(draftId) && StringUtils.isBlank(taskId)) {
|
||||
throw new JeroBootException(ResultCommon.NO_PERMISSION);
|
||||
}
|
||||
if (StringUtils.isNotBlank(taskId)) {
|
||||
isMyTask(taskId);
|
||||
}
|
||||
|
||||
ProcessInfoVO processInfoVO = new ProcessInfoVO();
|
||||
// 流程信息
|
||||
BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
|
||||
@@ -356,6 +363,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
|
||||
// 审批信息
|
||||
if (StringUtils.isNotBlank(draftId)) {
|
||||
ProcessDraft processDraft = processDraftService.getById(draftId);
|
||||
if (!CurrentUserUtil.getId().equals(processDraft.getUserId())) {
|
||||
throw new JeroBootException(ResultCommon.NO_PERMISSION);
|
||||
}
|
||||
if (!Objects.isNull(processDraft)) {
|
||||
basicTaskInfoDTO.setTaskId(processDraft.getTaskId());
|
||||
basicTaskInfoDTO.setHandleText(processDraft.getHandleText());
|
||||
|
||||
Reference in New Issue
Block a user