Compare commits
3 Commits
5c16890397
...
9e48b0b302
Author | SHA1 | Date | |
---|---|---|---|
![]() |
9e48b0b302 | ||
![]() |
66419fe9ab | ||
![]() |
687d35eb53 |
@ -69,7 +69,7 @@ public class BpmOAImprestController {
|
|||||||
return success(respVO);
|
return success(respVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/getByProcessInstanceId")
|
@GetMapping("/getProcessInstanceId")
|
||||||
@Operation(summary = "获得备用金表单")
|
@Operation(summary = "获得备用金表单")
|
||||||
@Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024")
|
@Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024")
|
||||||
public CommonResult<BpmOAImprestRespVO> getByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {
|
public CommonResult<BpmOAImprestRespVO> getByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {
|
||||||
|
@ -4,9 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|||||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||||
import cn.iocoder.yudao.module.system.controller.admin.project.vo.ProjectPageReqVO;
|
import cn.iocoder.yudao.module.system.controller.admin.project.vo.ProjectPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
|
||||||
import cn.iocoder.yudao.module.system.dal.dataobject.project.ProjectDO;
|
import cn.iocoder.yudao.module.system.dal.dataobject.project.ProjectDO;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 项目管理 Mapper
|
* 项目管理 Mapper
|
||||||
*
|
*
|
||||||
@ -21,12 +24,16 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
|
|||||||
.eqIfPresent(ProjectDO::getType, reqVO.getType())
|
.eqIfPresent(ProjectDO::getType, reqVO.getType())
|
||||||
.likeIfPresent(ProjectDO::getName, reqVO.getName())
|
.likeIfPresent(ProjectDO::getName, reqVO.getName())
|
||||||
.eqIfPresent(ProjectDO::getResponsibleDept, reqVO.getResponsibleDept())
|
.eqIfPresent(ProjectDO::getResponsibleDept, reqVO.getResponsibleDept())
|
||||||
.likeIfPresent(ProjectDO::getParticipationDept, reqVO.getParticipationDept())
|
|
||||||
.eqIfPresent(ProjectDO::getDirectorUserId, reqVO.getDirectorUserId())
|
.eqIfPresent(ProjectDO::getDirectorUserId, reqVO.getDirectorUserId())
|
||||||
.betweenIfPresent(ProjectDO::getStartDate, reqVO.getStartDate())
|
.betweenIfPresent(ProjectDO::getStartDate, reqVO.getStartDate())
|
||||||
.betweenIfPresent(ProjectDO::getEndDate, reqVO.getEndDate())
|
.betweenIfPresent(ProjectDO::getEndDate, reqVO.getEndDate())
|
||||||
.eqIfPresent(ProjectDO::getIsLongTerm, reqVO.getIsLongTerm())
|
.eqIfPresent(ProjectDO::getIsLongTerm, reqVO.getIsLongTerm())
|
||||||
.eqIfPresent(ProjectDO::getStatus, reqVO.getStatus())
|
.eqIfPresent(ProjectDO::getStatus, reqVO.getStatus())
|
||||||
|
.likeLeft(ProjectDO::getParticipationDept, "-" + reqVO.getParticipationDept())
|
||||||
|
.or()
|
||||||
|
.likeRight(ProjectDO::getParticipationDept, reqVO.getParticipationDept() + "-")
|
||||||
|
.or()
|
||||||
|
.like(ProjectDO::getParticipationDept, "-" + reqVO.getParticipationDept() + "-")
|
||||||
.orderByDesc(ProjectDO::getId));
|
.orderByDesc(ProjectDO::getId));
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -268,11 +268,17 @@ public class DeptServiceImpl implements DeptService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@DataPermission(enable = false)
|
||||||
|
@Cacheable(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST, key = "#id")
|
||||||
public List<DeptDO> getChildDept(Long id) {
|
public List<DeptDO> getChildDept(Long id) {
|
||||||
|
|
||||||
return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
|
return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
|
||||||
.like(DeptDO::getFlag, id)
|
.eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
|
||||||
.eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
|
.likeLeft(DeptDO::getFlag, "-" + id)
|
||||||
|
.or()
|
||||||
|
.likeRight(DeptDO::getFlag, id + "-")
|
||||||
|
.or()
|
||||||
|
.like(DeptDO::getFlag, "-" + id + "-"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user