Compare commits

...

3 Commits

Author SHA1 Message Date
furongxin
9e48b0b302 refactor(bpm): 修改备用金表单接口名称
- 将 getByProcessInstanceId 方法的路径从 /getByProcessInstanceId 改为 /getProcessInstanceId
- 优化接口路径,使其更加简洁和一致
2024-12-03 18:12:56 +08:00
furongxin
66419fe9ab refactor(system): 优化部门和项目查询的 SQL 正则表达式
- 将 getChildDept 方法中的正则表达式替换为更高效的模糊查询组合
- 优化 ProjectMapper 中的参与部门查询条件,提高查询效率
- 在 DeptServiceImpl 中添加数据权限注解,控制访问权限
2024-12-02 09:19:42 +08:00
furongxin
687d35eb53 refactor(system): 优化部门和项目管理的查询逻辑
- 修改DeptServiceImpl中的getChildDept方法,使用正则表达式进行精确匹配- 更新ProjectMapper中的查询条件,使用正则表达式替代like操作以提高查询准确度
2024-11-29 19:41:34 +08:00
3 changed files with 17 additions and 4 deletions

View File

@ -69,7 +69,7 @@ public class BpmOAImprestController {
return success(respVO);
}
@GetMapping("/getByProcessInstanceId")
@GetMapping("/getProcessInstanceId")
@Operation(summary = "获得备用金表单")
@Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024")
public CommonResult<BpmOAImprestRespVO> getByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {

View File

@ -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.query.LambdaQueryWrapperX;
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 org.apache.ibatis.annotations.Mapper;
import java.util.Objects;
/**
* 项目管理 Mapper
*
@ -21,12 +24,16 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
.eqIfPresent(ProjectDO::getType, reqVO.getType())
.likeIfPresent(ProjectDO::getName, reqVO.getName())
.eqIfPresent(ProjectDO::getResponsibleDept, reqVO.getResponsibleDept())
.likeIfPresent(ProjectDO::getParticipationDept, reqVO.getParticipationDept())
.eqIfPresent(ProjectDO::getDirectorUserId, reqVO.getDirectorUserId())
.betweenIfPresent(ProjectDO::getStartDate, reqVO.getStartDate())
.betweenIfPresent(ProjectDO::getEndDate, reqVO.getEndDate())
.eqIfPresent(ProjectDO::getIsLongTerm, reqVO.getIsLongTerm())
.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));
}
}

View File

@ -268,11 +268,17 @@ public class DeptServiceImpl implements DeptService {
}
@Override
@DataPermission(enable = false)
@Cacheable(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST, key = "#id")
public List<DeptDO> getChildDept(Long id) {
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