|
|
@ -143,8 +143,10 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
|
|
|
|
queryWrapper.lambda().and(
|
|
|
|
queryWrapper.lambda().and(
|
|
|
|
t -> t.like(FlowTaskEntity::getEnCode, keyWord)
|
|
|
|
t -> t.like(FlowTaskEntity::getEnCode, keyWord)
|
|
|
|
.or().like(FlowTaskEntity::getFullName, keyWord)
|
|
|
|
.or().like(FlowTaskEntity::getFullName, keyWord)
|
|
|
|
|
|
|
|
// .or().like(FlowTaskEntity::getDescription, keyWord)
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//日期范围(近7天、近1月、近3月、自定义)
|
|
|
|
//日期范围(近7天、近1月、近3月、自定义)
|
|
|
|
String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
|
|
|
|
String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
|
|
|
|
String endTime = paginationFlowTask.getEndTime() != null ? paginationFlowTask.getEndTime() : null;
|
|
|
|
String endTime = paginationFlowTask.getEndTime() != null ? paginationFlowTask.getEndTime() : null;
|
|
|
@ -153,6 +155,11 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
|
|
|
|
Date endTimes = DateUtil.stringToDate(DateUtil.daFormatYmd(Long.parseLong(endTime)) + " 23:59:59");
|
|
|
|
Date endTimes = DateUtil.stringToDate(DateUtil.daFormatYmd(Long.parseLong(endTime)) + " 23:59:59");
|
|
|
|
queryWrapper.lambda().ge(FlowTaskEntity::getCreatorTime, startTimes).le(FlowTaskEntity::getCreatorTime, endTimes);
|
|
|
|
queryWrapper.lambda().ge(FlowTaskEntity::getCreatorTime, startTimes).le(FlowTaskEntity::getCreatorTime, endTimes);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// //流程描述
|
|
|
|
|
|
|
|
// String Description = paginationFlowTask.getFlowId() != null ? paginationFlowTask.getFlowId() : null;
|
|
|
|
|
|
|
|
// if (!StringUtils.isEmpty(Description)) {
|
|
|
|
|
|
|
|
// queryWrapper.lambda().eq(FlowTaskEntity::getFlowId, Description);
|
|
|
|
|
|
|
|
// }
|
|
|
|
//所属流程
|
|
|
|
//所属流程
|
|
|
|
String flowName = paginationFlowTask.getFlowId() != null ? paginationFlowTask.getFlowId() : null;
|
|
|
|
String flowName = paginationFlowTask.getFlowId() != null ? paginationFlowTask.getFlowId() : null;
|
|
|
|
if (!StringUtils.isEmpty(flowName)) {
|
|
|
|
if (!StringUtils.isEmpty(flowName)) {
|
|
|
@ -304,7 +311,7 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
|
|
|
|
//关键字(流程名称、流程编码)
|
|
|
|
//关键字(流程名称、流程编码)
|
|
|
|
String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
|
|
|
|
String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
|
|
|
|
if (!StringUtils.isEmpty(keyWord)) {
|
|
|
|
if (!StringUtils.isEmpty(keyWord)) {
|
|
|
|
dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%') ");
|
|
|
|
dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%' or t.F_Description like '%" + keyWord + "%') ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//日期范围(近7天、近1月、近3月、自定义)
|
|
|
|
//日期范围(近7天、近1月、近3月、自定义)
|
|
|
|
String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
|
|
|
|
String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
|
|
|
@ -458,7 +465,8 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
|
|
|
|
//关键字(流程名称、流程编码)
|
|
|
|
//关键字(流程名称、流程编码)
|
|
|
|
String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
|
|
|
|
String keyWord = paginationFlowTask.getKeyword() != null ? paginationFlowTask.getKeyword() : null;
|
|
|
|
if (!StringUtils.isEmpty(keyWord)) {
|
|
|
|
if (!StringUtils.isEmpty(keyWord)) {
|
|
|
|
dbSql.append(" AND (t.F_EnCode like " + " '%" + keyWord + "%' " + " or t.F_FullName like" + " '%" + keyWord + "%') ");
|
|
|
|
dbSql.append(" AND (t.F_EnCode like '%" + keyWord + "%' or t.F_FullName like '%" + keyWord + "%' or t.F_Description like '%" + keyWord + "%') ");
|
|
|
|
|
|
|
|
// dbSql.append(" AND (t.F_EnCode like " + " '%" + keyWord + "%' " + " or t.F_FullName like" + " '%" + keyWord + "%') ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//日期范围(近7天、近1月、近3月、自定义)
|
|
|
|
//日期范围(近7天、近1月、近3月、自定义)
|
|
|
|
String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
|
|
|
|
String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null;
|
|
|
|