diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java index c1ecfa4..8bb1f04 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java @@ -184,4 +184,6 @@ public class SysOaTaskBo extends BaseEntity { private Long itemStatus; private String files; + //project_code + private String projectCode; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java index 919627b..5e82bb5 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java @@ -211,4 +211,7 @@ public class SysOaTaskVo { private List taskItemVoList; private String files; + + //project_code + private String projectCode; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java index 7f9d376..cc62507 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java @@ -12,6 +12,7 @@ import com.ruoyi.oa.domain.bo.SysOaTaskItemBo; import com.ruoyi.oa.mapper.SysOaTaskItemMapper; import com.ruoyi.oa.service.ISysOaTaskItemService; import com.ruoyi.system.service.ISysOssService; +import jodd.util.StringUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -151,6 +152,8 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { lqw.like(bo.getTaskTitle()!=null, "sot.task_title", bo.getTaskTitle()); lqw.like(bo.getCreateUserNickName()!=null, "su1.nick_name", bo.getCreateUserNickName()); lqw.like(bo.getWorkerNickName()!=null, "su2.nick_name", bo.getWorkerNickName()); + // 添加projectCode的模糊查询判断 + lqw.like(bo.getProjectCode() != null, "sop.project_code", bo.getProjectCode()); return lqw; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml index 93cd403..572af9d 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml @@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sot.own_rank, sop.project_name, sop.project_num, + sop.project_code, su1.nick_name AS createUserNickName, su2.nick_name AS workerNickName, IF(