diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java index f9770542..1caedcd7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java @@ -392,4 +392,14 @@ public class EnforcementRegistrationBo extends BaseEntity { * 街道名称 */ private String streetName; + + /** + * 排序方向 asc/desc + */ + private String isAsc; + + /** + * 排序字段列 + */ + private String orderByColumn; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java index cafe6bd2..69f129c1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/LawEnfOfficerSericeImpl.java @@ -11,15 +11,28 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @RequiredArgsConstructor public class LawEnfOfficerSericeImpl implements ILawEnfOfficerService { private final LawEnfOfficerMapper lawEnfOfficerMapper; + + /** + * 构建分页对象:排序统一由 XML 中的 orderByColumn 白名单控制。 + * 清空 MyBatis-Plus 的 OrderItem,避免 PageQuery 把驼峰列名转成下划线列名后, + * 在 SQL 里再追加一个排序字段(如 order by xzzf_count asc, xzzfCount asc)。 + */ + private Page buildPage(PageQuery pageQuery) { + Page page = pageQuery.build(); + // 排序只由 XML 中的 orderByColumn 白名单决定,清空 MP 的 OrderItem + page.setOrders(new ArrayList<>()); + return page; + } @Override public TableDataInfo selectLawEnfOfficerPageList(PageQuery pageQuery, EnforcementRegistrationBo bo) { - Page list=lawEnfOfficerMapper.selectLawEnfOfficerPageList(pageQuery.build(),bo); + Page list=lawEnfOfficerMapper.selectLawEnfOfficerPageList(buildPage(pageQuery),bo); return TableDataInfo.build(list); } @@ -30,7 +43,7 @@ public class LawEnfOfficerSericeImpl implements ILawEnfOfficerService { @Override public TableDataInfo selectLawEnfOfficerDetailsPageList(PageQuery pageQuery, EnforcementRegistrationBo bo) { - Page list=lawEnfOfficerMapper.selectLawEnfOfficerDetailsPageList(pageQuery.build(),bo); + Page list=lawEnfOfficerMapper.selectLawEnfOfficerDetailsPageList(buildPage(pageQuery),bo); return TableDataInfo.build(list); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml index f31d46d6..0b9bf3bc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnfOfficerMapper.xml @@ -49,9 +49,17 @@ and t4.name like CONCAT('%', #{bo.districtName}, '%') + + and t1.bureauDeptName like CONCAT('%', #{bo.bureauDeptName}, '%') + and t4.level = 3 - order by t1.zfcs desc + order by + + zfcs + zfcs + + desc