|
|
|
@ -49,6 +49,11 @@ public class ConfinementService extends ServiceImpl<ConfinementMapper, Confineme |
|
|
|
queryWrapper.le("c1.start_time", param.getConfinementTime().get(1)) |
|
|
|
queryWrapper.le("c1.start_time", param.getConfinementTime().get(1)) |
|
|
|
.ge("c1.start_time", param.getConfinementTime().get(0)); |
|
|
|
.ge("c1.start_time", param.getConfinementTime().get(0)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 创建时间查询
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(param.getCreateTime())) { |
|
|
|
|
|
|
|
queryWrapper.le("c1.create_time", param.getCreateTime().get(1)) |
|
|
|
|
|
|
|
.ge("c1.create_time", param.getCreateTime().get(0)); |
|
|
|
|
|
|
|
} |
|
|
|
//部门的查询条件SELECT COUNT(*) AS total FROM confinement AS c1
|
|
|
|
//部门的查询条件SELECT COUNT(*) AS total FROM confinement AS c1
|
|
|
|
// WHERE (c1.start_time <= '2025-05-01T00:00' AND c1.start_time >= '2025-04-30T00:00')
|
|
|
|
// WHERE (c1.start_time <= '2025-05-01T00:00' AND c1.start_time >= '2025-04-30T00:00')
|
|
|
|
//
|
|
|
|
//
|
|
|
|
@ -121,6 +126,11 @@ public class ConfinementService extends ServiceImpl<ConfinementMapper, Confineme |
|
|
|
queryWrapper.le("c1.end_time", param.getConfinementTime().get(1)) |
|
|
|
queryWrapper.le("c1.end_time", param.getConfinementTime().get(1)) |
|
|
|
.ge("c1.start_time", param.getConfinementTime().get(0)); |
|
|
|
.ge("c1.start_time", param.getConfinementTime().get(0)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 创建时间查询
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(param.getCreateTime())) { |
|
|
|
|
|
|
|
queryWrapper.le("c1.create_time", param.getCreateTime().get(1)) |
|
|
|
|
|
|
|
.ge("c1.create_time", param.getCreateTime().get(0)); |
|
|
|
|
|
|
|
} |
|
|
|
//部门的查询条件
|
|
|
|
//部门的查询条件
|
|
|
|
if (StrUtil.isNotEmpty(param.getOrgId())) { |
|
|
|
if (StrUtil.isNotEmpty(param.getOrgId())) { |
|
|
|
if (param.getDepartBranch()) { |
|
|
|
if (param.getDepartBranch()) { |
|
|
|
|