Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,7 @@
 package com.kms.enterprise.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.enterprise.domain.dto.PersonDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -17,9 +19,8 @@ import java.util.List;
 @Repository
 public interface BsSgcYxjdPersonnelInfoMapper extends BaseMapper<BsSgcYxjdPersonnelInfo> {
 
-    List<PersonDto> getPerson(@Param("name") String name,
-                              @Param("adcd") String adcd,
-                              @Param("enterpriseName") String enterpriseName,
-                              @Param("pageNum") int pageNum,
-                              @Param("pageSize") int pageSize);
+    IPage<PersonDto> getPerson(@Param("name") String name,
+                               @Param("adcd") String adcd,
+                               @Param("enterpriseName") String enterpriseName,
+                               Page page);
 }

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

@@ -64,16 +64,12 @@ public class BsSgcYxjdPersonnelInfoService extends BaseService<BsSgcYxjdPersonne
 
     public IPage getPerson(PersonDto dto) {
 
-        List<PersonDto> person = bsSgcYxjdPersonnelInfoMapper.getPerson(dto.getName(),dto.getAdcd(), dto.getEnterpriseName(),
-                 dto.getPageNum(), dto.getPageSize());
-
-        Page<PersonDto> page = new Page<>(dto.getPageNum(), dto.getPageSize());
-        if (CollectionUtil.isNotEmpty(person)) {
-            page.setRecords(person);
-            page.setTotal(person.size());
-
-        }
-
-        return page;
+        IPage<PersonDto> person = bsSgcYxjdPersonnelInfoMapper.getPerson(dto.getName(),dto.getAdcd(),dto.getEnterpriseName(),new Page<>(dto.getPageNum(), dto.getPageSize()));
+//        Page<PersonDto> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+//        if (CollectionUtil.isNotEmpty(person)) {
+//            page.setRecords(person);
+//            page.setTotal(person.size());
+//        }
+        return person;
     }
 }

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

@@ -10,12 +10,10 @@
         <result property="enterpriseId" column="enterprise_id"/>
     </resultMap>
     <select id="getPerson" resultMap="PersonDto">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         select pi.name,ei.enterprise_name,pi.enterprise_id
         from bs_sgc_yxjd_personnel_info pi
                  left join bs_sgc_yxjd_enterprise_info ei on pi.enterprise_id = ei.id
         <where>
-
             <if test="adcd!=null and adcd!='' and adcd != '省外'">
                 adcd =#{adcd}
             </if>
@@ -31,9 +29,8 @@
             <if test="name!=null and name!=''">
                 and `name` like concat('%',#{name},'%')
             </if>
-
         </where>
-        order by pi.create_time desc limit #{pageNum},#{pageSize};
+        order by pi.create_time desc
     </select>
 
 

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

@@ -10,7 +10,7 @@
         <result property="qualificationCategory"   column="qualification_category"   />
         <result property="dynamicCreditScore"    column="dynamic_credit_score"    />
         <result property="legalRepresentative" column="legal_representative"/>
-        <result typeHandler="professionalCategory" column="professional_category"/>
+        <result property="professionalCategory" column="professional_category"/>
     </resultMap>
 
     <resultMap id="BsSgcYxjdQualificationsDto" type="BsSgcYxjdQualificationsDto">