1.1.50 工作流添加业务编码、业务标题检索。

dev
yinq 2 months ago
parent ad6ebdc6b3
commit af05b7fb12

@ -52,4 +52,14 @@ public class FlowInstanceBo implements Serializable {
*/ */
private List<Long> createByIds; private List<Long> createByIds;
/**
*
*/
private String businessCode;
/**
*
*/
private String businessTitle;
} }

@ -52,4 +52,14 @@ public class FlowTaskBo implements Serializable {
*/ */
private List<Long> createByIds; private List<Long> createByIds;
/**
*
*/
private String businessCode;
/**
*
*/
private String businessTitle;
} }

@ -138,6 +138,8 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
queryWrapper.in("fd.category", StreamUtils.toList(categoryIds, Convert::toStr)); queryWrapper.in("fd.category", StreamUtils.toList(categoryIds, Convert::toStr));
} }
queryWrapper.eq(StringUtils.isNotBlank(flowInstanceBo.getBusinessId()), "fi.business_id", flowInstanceBo.getBusinessId()); queryWrapper.eq(StringUtils.isNotBlank(flowInstanceBo.getBusinessId()), "fi.business_id", flowInstanceBo.getBusinessId());
queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getBusinessCode()), "biz.business_code", flowInstanceBo.getBusinessCode());
queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getBusinessTitle()), "biz.business_title", flowInstanceBo.getBusinessTitle());
queryWrapper.in(CollUtil.isNotEmpty(flowInstanceBo.getCreateByIds()), "fi.create_by", flowInstanceBo.getCreateByIds()); queryWrapper.in(CollUtil.isNotEmpty(flowInstanceBo.getCreateByIds()), "fi.create_by", flowInstanceBo.getCreateByIds());
queryWrapper.eq("fi.del_flag", "0"); queryWrapper.eq("fi.del_flag", "0");
queryWrapper.orderByDesc("fi.create_time"); queryWrapper.orderByDesc("fi.create_time");

@ -463,6 +463,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
wrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName()); wrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName());
wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName()); wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName());
wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode()); wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode());
wrapper.like(StringUtils.isNotBlank(flowTaskBo.getBusinessCode()), "t.business_code", flowTaskBo.getBusinessCode());
wrapper.like(StringUtils.isNotBlank(flowTaskBo.getBusinessTitle()), "t.business_title", flowTaskBo.getBusinessTitle());
wrapper.in(CollUtil.isNotEmpty(flowTaskBo.getCreateByIds()), "t.create_by", flowTaskBo.getCreateByIds()); wrapper.in(CollUtil.isNotEmpty(flowTaskBo.getCreateByIds()), "t.create_by", flowTaskBo.getCreateByIds());
if (StringUtils.isNotBlank(flowTaskBo.getCategory())) { if (StringUtils.isNotBlank(flowTaskBo.getCategory())) {
List<Long> categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowTaskBo.getCategory())); List<Long> categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowTaskBo.getCategory()));

Loading…
Cancel
Save