Merge remote-tracking branch 'origin/master'

jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java

@@ -20,10 +20,11 @@ public interface BsSgcYxjdDynamicCreditMapper extends BaseMapper<BsSgcYxjdDynami
 
     List<BadHaviorDto> getBadLimit();
 
-    List<BadHaviorDto> getBad(@Param("adcd") String adcd,
+    IPage<BadHaviorDto> getBad(
+                IPage page,
+                @Param("adcd") String adcd,
                  @Param("enterpriseName") String enterpriseName,
-                 @Param("qualificationCategory") String qualificationCategory,
-                 @Param("pageNum") int pageNum,@Param("pageSize") int pageSize);
+                 @Param("qualificationCategory") String qualificationCategory);
 
     List<BadHaviorDto> getBadAll(@Param("enterpriseId")String enterpriseId,
                                  @Param("type") String type);

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java

@@ -36,15 +36,15 @@ public class BsSgcYxjdDynamicCreditService extends BaseService<BsSgcYxjdDynamicC
     }
 
     public IPage getBad(DisclosureDto dto) {
-        List<BadHaviorDto> bad = bsSgcYxjdDynamicCreditMapper.getBad(dto.getAdcd(), dto.getEnterpriseName(),
-                dto.getQualificationCategory(), dto.getPageNum(), dto.getPageSize());
-
-        Page<BadHaviorDto> page = new Page<>(dto.getPageNum(), dto.getPageSize());
-        if (CollectionUtil.isNotEmpty(bad)) {
-            page.setRecords(bad);
-            page.setTotal(bad.size());
-
-        }
+        IPage<BadHaviorDto> page = bsSgcYxjdDynamicCreditMapper.getBad(new Page(dto.getPageNum(), dto.getPageSize()),dto.getAdcd(), dto.getEnterpriseName(),
+                dto.getQualificationCategory());
+
+//        Page<BadHaviorDto> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+//        if (CollectionUtil.isNotEmpty(bad)) {
+//            page.setRecords(bad);
+//            page.setTotal(bad.size());
+//
+//        }
 
         return page;
     }

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml

@@ -72,7 +72,6 @@
     </select>
 
     <select id="getBad" resultMap="BadHaviorDto">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         SELECT dc.enterprise_id,
                ei.enterprise_name,
                dc.qualification_category,
@@ -111,7 +110,7 @@
             </if>
         </where>
         group by dc.enterprise_id
-        order by create_time desc LIMIT #{pageNum},#{pageSize};
+        order by create_time ;
     </select>
 
     <select id="getGood" resultMap="BadHaviorDto2">