diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ScanDataSituationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ScanDataSituationBo.java index 24172812..1c797202 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ScanDataSituationBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ScanDataSituationBo.java @@ -52,4 +52,14 @@ public class ScanDataSituationBo { * 结束时间 */ private Date endTime; + + /** + * 排序字段 + */ + private String isAsc; + + /** + * 排序字段列 + */ + private String orderByColumn; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/ScanDataSituationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/ScanDataSituationServiceImpl.java index 9c9cb098..0bf3ffda 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/ScanDataSituationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/ScanDataSituationServiceImpl.java @@ -10,6 +10,7 @@ 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 @@ -18,9 +19,21 @@ public class ScanDataSituationServiceImpl implements IScanDataSituationService { private final ScanDataSituationMapper scanDataSituationMapper; + /** + * 构建分页对象:排序统一由 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 selectScanDataSituationAreaPageList(PageQuery pageQuery, ScanDataSituationBo bo) { - Page page=scanDataSituationMapper.selectScanDataSituationAreaPageList(pageQuery.build(),bo); + Page page=scanDataSituationMapper.selectScanDataSituationAreaPageList(buildPage(pageQuery),bo); return TableDataInfo.build(page); } @@ -31,14 +44,14 @@ public class ScanDataSituationServiceImpl implements IScanDataSituationService { @Override public TableDataInfo selectScanDataSituationAreaDetailsPageList(PageQuery pageQuery, ScanDataSituationBo bo) { - Page page=scanDataSituationMapper.selectScanDataSituationAreaDetailsPageList(pageQuery.build(),bo); + Page page=scanDataSituationMapper.selectScanDataSituationAreaDetailsPageList(buildPage(pageQuery),bo); return TableDataInfo.build(page); } @Override public TableDataInfo selectScanDataSituationDomainPageList(PageQuery pageQuery, ScanDataSituationBo bo) { - Page page=scanDataSituationMapper.selectScanDataSituationDomainPageList(pageQuery.build(),bo); + Page page=scanDataSituationMapper.selectScanDataSituationDomainPageList(buildPage(pageQuery),bo); return TableDataInfo.build(page); } @@ -49,7 +62,7 @@ public class ScanDataSituationServiceImpl implements IScanDataSituationService { @Override public TableDataInfo selectScanDataSituationDomainDetailsPageList(PageQuery pageQuery, ScanDataSituationBo bo) { - Page page=scanDataSituationMapper.selectScanDataSituationDomainDetailsPageList(pageQuery.build(),bo); + Page page=scanDataSituationMapper.selectScanDataSituationDomainDetailsPageList(buildPage(pageQuery),bo); return TableDataInfo.build(page); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ScanDataSituationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ScanDataSituationMapper.xml index 9d6a417c..1358a385 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ScanDataSituationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ScanDataSituationMapper.xml @@ -122,8 +122,19 @@ ) base + order by - xzzfslpm + + enterpriseCount + xzzfCount + xzzfslpm + xzzfslzb + fxzzfsl + fxzzfslpm + fxzzfslzb + xzzfslpm + + desc @@ -371,7 +393,16 @@ ) base order by - xzzfslpm + + xzzfCount + xzzfslpm + xzzfslzb + fxzzfsl + fxzzfslpm + fxzzfslzb + xzzfslpm + + desc