diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java index f6a62b7f..b1520f76 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java @@ -29,11 +29,10 @@ public interface BsSgcYxjdDynamicCreditMapper extends BaseMapper getBadAll(@Param("enterpriseId")String enterpriseId, @Param("type") String type); - List getGood(@Param("adcd")String adcd, + IPage getGood(@Param("adcd")String adcd, @Param("enterpriseName") String enterpriseName, @Param("qualificationCategory")String qualificationCategory, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage page); List getGoodAll(@Param("enterpriseId")String enterpriseId, @Param("type") String type); diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java index 8b9f14ed..1e20cdac 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java @@ -48,15 +48,15 @@ public class BsSgcYxjdDynamicCreditService extends BaseService good = bsSgcYxjdDynamicCreditMapper.getGood(dto.getAdcd(), dto.getEnterpriseName(), - dto.getQualificationCategory(), dto.getPageNum(), dto.getPageSize()); + IPage page = bsSgcYxjdDynamicCreditMapper.getGood(dto.getAdcd(), dto.getEnterpriseName(), + dto.getQualificationCategory(), new Page<>(dto.getPageNum(), dto.getPageSize())); - Page page = new Page<>(dto.getPageNum(), dto.getPageSize()); - if (CollectionUtil.isNotEmpty(good)) { - page.setRecords(good); - page.setTotal(good.size()); - } +// if (CollectionUtil.isNotEmpty(good)) { +// page.setRecords(good); +// page.setTotal(good.size()); +// +// } return page; } diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml index 14973ac6..d3fe4d3a 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml @@ -110,11 +110,10 @@ group by dc.enterprise_id - order by create_time; + order by create_time