|
|
|
@ -86,7 +86,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public TableDataInfo<EnforcementRegistrationVo> queryPageList(EnforcementRegistrationBo bo, PageQuery pageQuery) { |
|
|
|
LambdaQueryWrapper<EnforcementRegistration> lqw = buildQueryWrapper(bo); |
|
|
|
// 使用App端专用的查询条件构建器
|
|
|
|
LambdaQueryWrapper<EnforcementRegistration> lqw = buildAppListQueryWrapper(bo); |
|
|
|
Page<EnforcementRegistrationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); |
|
|
|
return TableDataInfo.build(result); |
|
|
|
} |
|
|
|
@ -728,9 +729,126 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat |
|
|
|
@DataScope(deptField = "bureau_dept_id", extraDeptField = "entrust_dept_id") |
|
|
|
public List<EnforcementRegistrationVo> selectEnforcementRegistrationList(EnforcementRegistrationBo bo, PageQuery pageQuery) |
|
|
|
{ |
|
|
|
Page<EnforcementRegistrationVo> page = pageQuery.build(); |
|
|
|
List<EnforcementRegistrationVo> vo = baseMapper.selectEnforcementRegistrationList(bo, page); |
|
|
|
return vo; |
|
|
|
// 使用MyBatis-Plus标准分页查询，避免复杂SQL导致分页失效
|
|
|
|
LambdaQueryWrapper<EnforcementRegistration> lqw = buildAppListQueryWrapper(bo); |
|
|
|
Page<EnforcementRegistrationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); |
|
|
|
return result.getRecords(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 构建App端执法登记列表查询条件 |
|
|
|
* 用于替代XML中的复杂SQL，使分页拦截器能正常工作 |
|
|
|
*/ |
|
|
|
private LambdaQueryWrapper<EnforcementRegistration> buildAppListQueryWrapper(EnforcementRegistrationBo bo) { |
|
|
|
LambdaQueryWrapper<EnforcementRegistration> lqw = Wrappers.lambdaQuery(); |
|
|
|
|
|
|
|
// 已提交的数据
|
|
|
|
lqw.eq(EnforcementRegistration::getIsSubmit, 1L); |
|
|
|
|
|
|
|
// 企业ID
|
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseId()), |
|
|
|
EnforcementRegistration::getEnterpriseId, bo.getEnterpriseId()); |
|
|
|
|
|
|
|
// 企业名称模糊查询
|
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), |
|
|
|
EnforcementRegistration::getEnterpriseName, bo.getEnterpriseName()); |
|
|
|
|
|
|
|
// 企业税号
|
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), |
|
|
|
EnforcementRegistration::getEnterpriseNumber, bo.getEnterpriseNumber()); |
|
|
|
|
|
|
|
// 删除标记
|
|
|
|
lqw.eq(bo.getIsDelete() != null, EnforcementRegistration::getIsDelete, bo.getIsDelete()); |
|
|
|
|
|
|
|
// 状态
|
|
|
|
lqw.eq(bo.getStatus() != null, EnforcementRegistration::getStatus, bo.getStatus()); |
|
|
|
|
|
|
|
// 联合执法编号
|
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getUnionNo()), |
|
|
|
EnforcementRegistration::getUnionNo, bo.getUnionNo()); |
|
|
|
|
|
|
|
// 是否联合执法
|
|
|
|
lqw.eq(bo.getHasUnion() != null, EnforcementRegistration::getHasUnion, bo.getHasUnion()); |
|
|
|
|
|
|
|
// 是否真实联合执法
|
|
|
|
lqw.eq(bo.getIsRealUnion() != null, EnforcementRegistration::getIsRealUnion, bo.getIsRealUnion()); |
|
|
|
|
|
|
|
// 是否自动
|
|
|
|
lqw.eq(bo.getHasAuto() != null, EnforcementRegistration::getHasAuto, bo.getHasAuto()); |
|
|
|
|
|
|
|
// 搜索值（企业名称）
|
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getSearchValue()), |
|
|
|
EnforcementRegistration::getEnterpriseName, bo.getSearchValue()); |
|
|
|
|
|
|
|
// 日期搜索（年月）
|
|
|
|
if (StringUtils.isNotBlank(bo.getDateSearch())) { |
|
|
|
lqw.apply("DATE_FORMAT(enforcement_time, '%Y-%m') = {0}", bo.getDateSearch()); |
|
|
|
} |
|
|
|
|
|
|
|
// dateType: 1-本月, 2-本季度, 3-本年
|
|
|
|
if (bo.getDateType() != null) { |
|
|
|
if (bo.getDateType() == 1) { |
|
|
|
lqw.apply("DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')"); |
|
|
|
} else if (bo.getDateType() == 2) { |
|
|
|
int month = java.time.LocalDate.now().getMonthValue(); |
|
|
|
int quarter = (month - 1) / 3 + 1; |
|
|
|
int startMonth = (quarter - 1) * 3 + 1; |
|
|
|
int endMonth = quarter * 3; |
|
|
|
String year = String.valueOf(java.time.LocalDate.now().getYear()); |
|
|
|
lqw.apply("DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT({0}, '-', LPAD({1}, 2, '0'))", year, startMonth); |
|
|
|
lqw.apply("DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT({0}, '-', LPAD({1}, 2, '0'))", year, endMonth); |
|
|
|
} else if (bo.getDateType() == 3) { |
|
|
|
lqw.apply("DATE_FORMAT(enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 开始时间
|
|
|
|
if (StringUtils.isNotBlank(bo.getBeginTime())) { |
|
|
|
lqw.apply("DATE_FORMAT(enforcement_time, '%Y-%m-%d') >= {0}", bo.getBeginTime()); |
|
|
|
} |
|
|
|
|
|
|
|
// 结束时间
|
|
|
|
if (StringUtils.isNotBlank(bo.getEndTime())) { |
|
|
|
lqw.apply("DATE_FORMAT(enforcement_time, '%Y-%m-%d') <= {0}", bo.getEndTime()); |
|
|
|
} |
|
|
|
|
|
|
|
// params中的时间 - 修复类型转换问题
|
|
|
|
if (bo.getParams() != null) { |
|
|
|
Object beginTimeObj = bo.getParams().get("beginTime"); |
|
|
|
if (beginTimeObj != null) { |
|
|
|
String beginTime = String.valueOf(beginTimeObj); |
|
|
|
if (StringUtils.isNotBlank(beginTime)) { |
|
|
|
lqw.ge(EnforcementRegistration::getEnforcementTime, beginTime); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Object endTimeObj = bo.getParams().get("endTime"); |
|
|
|
if (endTimeObj != null) { |
|
|
|
String endTime = String.valueOf(endTimeObj); |
|
|
|
if (StringUtils.isNotBlank(endTime)) { |
|
|
|
lqw.le(EnforcementRegistration::getEnforcementTime, endTime); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 用户权限过滤
|
|
|
|
if (StringUtils.isNotBlank(bo.getUserId()) && |
|
|
|
(StringUtils.isBlank(bo.getBureauDeptId()))) { |
|
|
|
lqw.and(wrapper -> wrapper |
|
|
|
.eq(EnforcementRegistration::getLawEnforcerId, bo.getUserId()) |
|
|
|
.or().eq(EnforcementRegistration::getUserId, bo.getUserId()) |
|
|
|
.or().apply("FIND_IN_SET({0}, law_enforcer_id_two)", bo.getUserId()) |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
// 局部门ID过滤
|
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), |
|
|
|
EnforcementRegistration::getBureauDeptId, bo.getBureauDeptId()); |
|
|
|
|
|
|
|
// 按执法时间倒序
|
|
|
|
lqw.orderByDesc(EnforcementRegistration::getEnforcementTime); |
|
|
|
|
|
|
|
return lqw; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|
niujiyi
5 months ago