Skip to content

Y
yanxuan-qc-change-system
Commit fd9f7de7 by 王志超
Options

feat: 变更行动工单列表，过滤行动人和行动部门

parent 6f82da45
Showing with 68 additions and 93 deletions
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeSubFlowBiz.java
...@@ -350,10 +350,9 @@ public class ChangeSubFlowBiz { ...@@ -350,10 +350,9 @@ public class ChangeSubFlowBiz {
log.info("[querySubFlowList] page:{}, pageSize:{}, queryReq:{}", page, pageSize, JSON.toJSONString(queryReq)); log.info("[querySubFlowList] page:{}, pageSize:{}, queryReq:{}", page, pageSize, JSON.toJSONString(queryReq));
// 根据主单条件（flowId, itemId, supplier, onlyMyFollowed）查询主单，获取 changeRecordIds // 根据主单条件（flowId, itemId, supplier, onlyMyFollowed）查询主单，获取 changeRecordIds
List<Long> changeRecordIds = null; if (queryReq.getFlowId() != null || StringUtils.isNotBlank(queryReq.getItemId())
if (queryReq.getFlowId() != null || StringUtils.isNotBlank(queryReq.getItemId())
|| StringUtils.isNotBlank(queryReq.getSupplier()) || queryReq.getOnlyMyFollowed()) { || StringUtils.isNotBlank(queryReq.getSupplier()) || queryReq.getOnlyMyFollowed()) {
changeRecordIds = filterFlowRecordIds(queryReq); List<Long> changeRecordIds = filterFlowRecordIds(queryReq);
if (CollectionUtils.isEmpty(changeRecordIds)) { if (CollectionUtils.isEmpty(changeRecordIds)) {
// 如果主单查询结果为空，直接返回 // 如果主单查询结果为空，直接返回
PageVO pageVO = buildPageVo(0L, pageSize, page); PageVO pageVO = buildPageVo(0L, pageSize, page);
...@@ -362,28 +361,28 @@ public class ChangeSubFlowBiz { ...@@ -362,28 +361,28 @@ public class ChangeSubFlowBiz {
result.setChangeSubFlowList(new ArrayList<>()); result.setChangeSubFlowList(new ArrayList<>());
return result; return result;
} }
queryReq.setChangeRecordIds(changeRecordIds);
} }
// 根据行动项条件（changeExecUser, changeExecDepartment）查询执行项，获取 subFlowId 列表 // 根据行动项条件（changeExecUser, changeExecDepartment）查询执行项，获取 subFlowId 列表
List<String> subFlowIds = filterSubFlowIdsByExecCondition(queryReq); if (StringUtils.isNotBlank(queryReq.getChangeExecUser())
if (subFlowIds != null && CollectionUtils.isEmpty(subFlowIds)) { || StringUtils.isNotBlank(queryReq.getChangeExecDepartment())) {
// 如果子单ID列表为空，直接返回 List<String> subFlowIds = filterSubFlowIdsByExecCondition(queryReq);
PageVO pageVO = buildPageVo(0L, pageSize, page); if (CollectionUtils.isEmpty(subFlowIds)) {
ChangeSubFlowListVO result = new ChangeSubFlowListVO(); // 如果子单ID列表为空，直接返回
result.setPageVo(pageVO); PageVO pageVO = buildPageVo(0L, pageSize, page);
result.setChangeSubFlowList(new ArrayList<>()); ChangeSubFlowListVO result = new ChangeSubFlowListVO();
return result; result.setPageVo(pageVO);
result.setChangeSubFlowList(new ArrayList<>());
return result;
}
queryReq.setSubFlowIds(subFlowIds);
} }
// 第三步：将查询条件填充到 queryReq，用 changeRecordIds + subFlowIds + 其他条件（subFlowNode, startTime, endTime）直接查询子单 // 第三步：将查询条件填充到 queryReq，用 changeRecordIds + subFlowIds + 其他条件（subFlowNode, startTime, endTime）直接查询子单
queryReq.setChangeRecordIds(changeRecordIds);
queryReq.setSubFlowIds(subFlowIds);
// 清空主单和行动项相关的查询条件，因为已经通过 changeRecordIds 和 subFlowIds 过滤了 // 清空主单和行动项相关的查询条件，因为已经通过 changeRecordIds 和 subFlowIds 过滤了
queryReq.setFlowId(null);
queryReq.setItemId(null);
queryReq.setSupplier(null);
queryReq.setChangeExecUser(null);
queryReq.setChangeExecDepartment(null);
queryReq.setOnlyMyFollowed(null); queryReq.setOnlyMyFollowed(null);
queryReq.setCurrentUser(null); queryReq.setCurrentUser(null);
...@@ -542,60 +541,27 @@ public class ChangeSubFlowBiz { ...@@ -542,60 +541,27 @@ public class ChangeSubFlowBiz {
* 根据行动项条件（changeExecUser, changeExecDepartment）查询执行项，获取 subFlowId 列表 * 根据行动项条件（changeExecUser, changeExecDepartment）查询执行项，获取 subFlowId 列表
* *
* @param queryReq 查询条件 * @param queryReq 查询条件
* @return subFlowId 列表，如果没有行动项条件则返回 null * @return subFlowId 列表
*/ */
private List<String> filterSubFlowIdsByExecCondition(ChangeSubFlowListQueryReq queryReq) { private List<String> filterSubFlowIdsByExecCondition(ChangeSubFlowListQueryReq queryReq) {
// 如果没有行动项条件，返回 null // 使用合并查询，根据字段是否为 null 来查询
if (StringUtils.isBlank(queryReq.getChangeExecUser()) List<Long> subFlowRecordIds = changeFlowExecService
&& StringUtils.isBlank(queryReq.getChangeExecDepartment())) { .querySubFlowRecordIdsByExecCondition(queryReq.getChangeExecUser(), queryReq.getChangeExecDepartment());
return null;
}
List<Long> subFlowRecordIds = new ArrayList<>();
// 根据 changeExecUser 查询（只查询 email，使用 LIKE）
if (StringUtils.isNotBlank(queryReq.getChangeExecUser())) {
List<Long> userSubFlowRecordIds = changeFlowExecService.querySubFlowRecordIdsByExecUser(queryReq.getChangeExecUser());
if (CollectionUtils.isNotEmpty(userSubFlowRecordIds)) {
subFlowRecordIds.addAll(userSubFlowRecordIds);
}
}
// 根据 changeExecDepartment 查询
if (StringUtils.isNotBlank(queryReq.getChangeExecDepartment())) {
List<Long> deptSubFlowRecordIds = changeFlowExecService.querySubFlowRecordIdsByExecDepartment(queryReq.getChangeExecDepartment());
if (CollectionUtils.isNotEmpty(deptSubFlowRecordIds)) {
if (CollectionUtils.isNotEmpty(subFlowRecordIds)) {
// 取交集
subFlowRecordIds = subFlowRecordIds.stream()
.filter(deptSubFlowRecordIds::contains)
.collect(Collectors.toList());
} else {
subFlowRecordIds = deptSubFlowRecordIds;
}
}
}
// 如果行动项查询结果为空，返回空列表 // 如果行动项查询结果为空，返回空列表
if (CollectionUtils.isEmpty(subFlowRecordIds)) { if (CollectionUtils.isEmpty(subFlowRecordIds)) {
return new ArrayList<>(); return new ArrayList<>();
} }
// 根据 subFlowRecordId 查询子单，获取 subFlowId 列表 // 根据 subFlowRecordId 批量查询子单，获取 subFlowId 列表
List<ChangeSubFlowRecord> subFlowRecords = subFlowRecordIds.stream() List<ChangeSubFlowRecord> subFlowRecords = changeSubFlowRecordMapper.selectByIds(subFlowRecordIds);
.map(id -> changeSubFlowRecordMapper.selectByPrimaryKey(id))
.filter(Objects::nonNull)
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(subFlowRecords)) { if (CollectionUtils.isEmpty(subFlowRecords)) {
return new ArrayList<>(); return new ArrayList<>();
} }
return subFlowRecords.stream() return subFlowRecords.stream().map(ChangeSubFlowRecord::getSubFlowId).filter(StringUtils::isNotBlank).distinct()
.map(ChangeSubFlowRecord::getSubFlowId) .collect(Collectors.toList());
.filter(StringUtils::isNotBlank)
.distinct()
.collect(Collectors.toList());
} }
/** /**
......
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/ChangeFlowExecService.java
...@@ -58,16 +58,10 @@ public interface ChangeFlowExecService { ...@@ -58,16 +58,10 @@ public interface ChangeFlowExecService {
List<ChangeExecRecord> getBySubFlowRecordId(Long subFlowRecordId); List<ChangeExecRecord> getBySubFlowRecordId(Long subFlowRecordId);
/** /**
* 根据变更行动人查询变更行动工单记录ID列表 * 根据变更行动人和部门查询变更行动工单记录ID列表（合并查询）
* @param changeExecUser 变更行动人（邮箱或姓名） * @param changeExecUser 变更行动人（邮箱），可为空
* @param changeExecDepartment 变更行动部门，可为空
* @return 变更行动工单记录ID列表 * @return 变更行动工单记录ID列表
*/ */
List<Long> querySubFlowRecordIdsByExecUser(String changeExecUser); List<Long> querySubFlowRecordIdsByExecCondition(String changeExecUser, String changeExecDepartment);
/**
* 根据变更行动部门查询变更行动工单记录ID列表
* @param changeExecDepartment 变更行动部门
* @return 变更行动工单记录ID列表
*/
List<Long> querySubFlowRecordIdsByExecDepartment(String changeExecDepartment);
} }
\ No newline at end of file
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFlowExecServiceImpl.java
...@@ -86,18 +86,13 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService { ...@@ -86,18 +86,13 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
} }
@Override @Override
public List<Long> querySubFlowRecordIdsByExecUser(String changeExecUser) { public List<Long> querySubFlowRecordIdsByExecCondition(String changeExecUser, String changeExecDepartment) {
if (StringUtils.isBlank(changeExecUser)) { // 如果两个条件都为空，返回空列表
if (StringUtils.isBlank(changeExecUser) && StringUtils.isBlank(changeExecDepartment)) {
return new ArrayList<>(); return new ArrayList<>();
} }
return changeExecRecordMapper.querySubFlowRecordIdsByExecUser("%" + changeExecUser + "%"); // 如果 changeExecUser 不为空，添加 LIKE 通配符
} String userCondition = StringUtils.isNotBlank(changeExecUser) ? "%" + changeExecUser + "%" : null;
return changeExecRecordMapper.querySubFlowRecordIdsByExecCondition(userCondition, changeExecDepartment);
@Override
public List<Long> querySubFlowRecordIdsByExecDepartment(String changeExecDepartment) {
if (StringUtils.isBlank(changeExecDepartment)) {
return new ArrayList<>();
}
return changeExecRecordMapper.querySubFlowRecordIdsByExecDepartment(changeExecDepartment);
} }
} }
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeExecRecordMapper.java
...@@ -52,18 +52,23 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper< ...@@ -52,18 +52,23 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper<
List<ChangeExecRecord> selectBySubFlowRecordId(@Param("subFlowRecordId") Long subFlowRecordId); List<ChangeExecRecord> selectBySubFlowRecordId(@Param("subFlowRecordId") Long subFlowRecordId);
/** /**
* 根据变更行动人查询变更行动工单记录ID列表（只查询 email，使用 LIKE） * 根据变更行动人和部门查询变更行动工单记录ID列表（合并查询）
* @param changeExecUser 变更行动人（邮箱） * @param changeExecUser 变更行动人（邮箱），可为空
* @param changeExecDepartment 变更行动部门，可为空
* @return 变更行动工单记录ID列表 * @return 变更行动工单记录ID列表
*/ */
@Select("SELECT DISTINCT(sub_flow_record_id) FROM TB_YX_QC_CHANGE_EXEC_RECORD WHERE sub_flow_record_id IS NOT NULL AND change_exec_user_email LIKE #{changeExecUser}") @Select({
List<Long> querySubFlowRecordIdsByExecUser(@Param("changeExecUser") String changeExecUser); "<script>",
"SELECT DISTINCT(sub_flow_record_id) FROM TB_YX_QC_CHANGE_EXEC_RECORD",
/** "WHERE sub_flow_record_id IS NOT NULL",
* 根据变更行动部门查询变更行动工单记录ID列表 "<if test='changeExecUser != null'>",
* @param changeExecDepartment 变更行动部门 "AND change_exec_user_email LIKE #{changeExecUser}",
* @return 变更行动工单记录ID列表 "</if>",
*/ "<if test='changeExecDepartment != null'>",
@Select("SELECT DISTINCT(sub_flow_record_id) FROM TB_YX_QC_CHANGE_EXEC_RECORD WHERE sub_flow_record_id IS NOT NULL AND change_exec_department = #{changeExecDepartment}") "AND change_exec_department LIKE CONCAT('%',#{changeExecDepartment},'%')",
List<Long> querySubFlowRecordIdsByExecDepartment(@Param("changeExecDepartment") String changeExecDepartment); "</if>",
"</script>"
})
List<Long> querySubFlowRecordIdsByExecCondition(@Param("changeExecUser") String changeExecUser,
@Param("changeExecDepartment") String changeExecDepartment);
} }
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeSubFlowRecordMapper.java
...@@ -52,6 +52,20 @@ public interface ChangeSubFlowRecordMapper extends tk.mybatis.mapper.common.Mapp ...@@ -52,6 +52,20 @@ public interface ChangeSubFlowRecordMapper extends tk.mybatis.mapper.common.Mapp
List<ChangeSubFlowRecord> selectByChangeRecordIds(@Param("changeRecordIds") List<Long> changeRecordIds); List<ChangeSubFlowRecord> selectByChangeRecordIds(@Param("changeRecordIds") List<Long> changeRecordIds);
/** /**
* 批量根据ID列表查询变更行动工单列表
* @param ids ID列表
* @return 变更行动工单列表
*/
@Select("<script>" +
"SELECT * FROM TB_YX_QC_CHANGE_SUB_FLOW_RECORD " +
"WHERE id IN " +
"<foreach collection='ids' item='id' open='(' separator=',' close=')'>" +
"#{id}" +
"</foreach>" +
"</script>")
List<ChangeSubFlowRecord> selectByIds(@Param("ids") List<Long> ids);
/**
* 根据条件查询变更行动工单列表 * 根据条件查询变更行动工单列表
* @param queryReq 查询条件 * @param queryReq 查询条件
* @return 变更行动工单列表 * @return 变更行动工单列表
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment