Commit 4d2346a4 by 王志超

feat: 变更行动工单列表

parent f2eaa556
......@@ -63,4 +63,18 @@ public interface ChangeFlowExecService {
* @return 行动项列表
*/
List<ChangeExecRecord> getBySubFlowRecordId(Long subFlowRecordId);
/**
* 根据变更行动人查询变更行动工单记录ID列表
* @param changeExecUser 变更行动人(邮箱或姓名)
* @return 变更行动工单记录ID列表
*/
List<Long> querySubFlowRecordIdsByExecUser(String changeExecUser);
/**
* 根据变更行动部门查询变更行动工单记录ID列表
* @param changeExecDepartment 变更行动部门
* @return 变更行动工单记录ID列表
*/
List<Long> querySubFlowRecordIdsByExecDepartment(String changeExecDepartment);
}
\ No newline at end of file
......@@ -11,6 +11,7 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -88,4 +89,20 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
}
return changeExecRecordMapper.selectBySubFlowRecordId(subFlowRecordId);
}
@Override
public List<Long> querySubFlowRecordIdsByExecUser(String changeExecUser) {
if (StringUtils.isBlank(changeExecUser)) {
return new ArrayList<>();
}
return changeExecRecordMapper.querySubFlowRecordIdsByExecUser("%" + changeExecUser + "%");
}
@Override
public List<Long> querySubFlowRecordIdsByExecDepartment(String changeExecDepartment) {
if (StringUtils.isBlank(changeExecDepartment)) {
return new ArrayList<>();
}
return changeExecRecordMapper.querySubFlowRecordIdsByExecDepartment(changeExecDepartment);
}
}
......@@ -53,4 +53,20 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper<
*/
@Select("SELECT * FROM TB_YX_QC_CHANGE_EXEC_RECORD WHERE sub_flow_record_id = #{subFlowRecordId}")
List<ChangeExecRecord> selectBySubFlowRecordId(@Param("subFlowRecordId") Long subFlowRecordId);
/**
* 根据变更行动人查询变更行动工单记录ID列表
* @param changeExecUser 变更行动人(邮箱或姓名)
* @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} OR change_exec_user LIKE #{changeExecUser})")
List<Long> querySubFlowRecordIdsByExecUser(@Param("changeExecUser") String changeExecUser);
/**
* 根据变更行动部门查询变更行动工单记录ID列表
* @param changeExecDepartment 变更行动部门
* @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_department = #{changeExecDepartment}")
List<Long> querySubFlowRecordIdsByExecDepartment(@Param("changeExecDepartment") String changeExecDepartment);
}
......@@ -79,5 +79,10 @@ public class ChangeSubFlowListQueryReq {
* 变更记录ID列表(用于过滤)
*/
private List<Long> changeRecordIds;
/**
* 变更行动工单ID列表(用于过滤)
*/
private List<String> subFlowIds;
}
......@@ -37,6 +37,12 @@
#{item}
</foreach>
</if>
<if test="subFlowIds != null and subFlowIds.size() > 0">
and sub_flow_id in
<foreach collection="subFlowIds" close=")" open="(" item="item" separator=",">
#{item}
</foreach>
</if>
</where>
order by create_time desc
</select>
......
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