Merge remote-tracking branch 'origin/dev' into dev

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -1,6 +1,8 @@
 package com.sckw.system.api;
 
 import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.model.page.PageResult;
 import com.sckw.system.api.model.dto.req.*;
 import com.sckw.system.api.model.dto.res.*;
 import java.util.List;
@@ -182,4 +184,13 @@ public interface RemoteUserService {
      * @date: 2023/7/27
      */
     List<EntTypeResDto> queryEntTypeById(Long entId);
+
+    /**
+     * @param cityCode 区域code  entTypeList 企业类型  page 页数 pageSize页大小
+     * @return PageResult
+     * @desc: 根据区域code和企业类型分页查询企业信息
+     * @author: czh
+     * @date: 2023/9/1
+     */
+    PageResult queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, Integer page, Integer pageSize);
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEnterpriseDao.java

@@ -141,4 +141,14 @@ public interface KwsEnterpriseDao {
      * @date: 2023/7/10
      */
     List<KwsEnterprise> checkEntRepeat(@Param(value = "entName") String entName, @Param(value = "phone") String phone);
+
+    /**
+     * @param cityCode 区域code  entTypeList 企业类型
+     * @return PageResult
+     * @desc: 根据区域code和企业类型分页查询企业信息
+     * @author: czh
+     * @date: 2023/9/1
+     */
+    List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(@Param(value = "cityCode") Integer cityCode, @Param(value = "entTypeList") List<Integer> entTypeList);
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteBaseService.java

@@ -183,4 +183,16 @@ public class RemoteBaseService {
     public REnterpriseVo queryEntDetails(Long entId) {
         return kwsEnterpriseService.queryEntDetails(entId);
     }
+
+
+    /**
+     * @param cityCode 区域code  entTypeList 企业类型
+     * @return PageResult
+     * @desc: 根据区域code和企业类型分页查询企业信息
+     * @author: czh
+     * @date: 2023/9/1
+     */
+    public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList) {
+        return kwsEnterpriseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList);
+    }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -1,9 +1,14 @@
 package com.sckw.system.dubbo;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.page.PageHelperUtil;
+import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.req.ForgetPasswordReqDto;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
@@ -17,6 +22,7 @@ import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindMenuTreePojo;
 import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.system.model.vo.res.KwsMenuResVo;
+import com.sckw.system.model.vo.res.KwsUserResVo;
 import com.sckw.system.service.*;
 import jakarta.annotation.Resource;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -168,6 +174,21 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return remoteBaseService.queryEntTypeById(entId);
     }
 
+
+    /**
+     * @param cityCode 区域code  entTypeList 企业类型  page 页数 pageSize页大小
+     * @return PageResult
+     * @desc: 根据区域code和企业类型分页查询企业信息
+     * @author: czh
+     * @date: 2023/9/1
+     */
+    @Override
+    public PageResult queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, Integer page, Integer pageSize) {
+        PageHelper.startPage(page, pageSize);
+        List<KwsEnterprise> list = remoteBaseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList);
+        return PageHelperUtil.getPageResult(new PageInfo<>(list));
+    }
+
     @Override
     public KwsUserResDto getUserByAccount(String username) {
         return remoteBaseService.getUserByAccount(username);

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -965,4 +965,14 @@ public class KwsEnterpriseService {
         return enterpriseVo;
     }
 
+    /**
+     * @param cityCode 区域code  entTypeList 企业类型
+     * @return PageResult
+     * @desc: 根据区域code和企业类型分页查询企业信息
+     * @author: czh
+     * @date: 2023/9/1
+     */
+    public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList) {
+        return kwsEnterpriseDao.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList);
+    }
 }

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -291,7 +291,25 @@
     </if>
   </select>
 
-  <insert id="insert" parameterType="com.sckw.system.model.KwsEnterprise">
+    <select id="queryEntInfoByCityCodeAndEntTypesWithPage" resultType="com.sckw.system.model.KwsEnterprise">
+      SELECT a.*
+        FROM kws_enterprise a
+             LEFT JOIN sys_area b ON a.city_code = b.CODE
+      where 1 = 1
+        <if test="cityCode != null">
+          and (b.code = #{cityCode} or b.province_code = #{cityCode} or b.pcode = #{cityCode})
+        </if>
+        and exists (select 1
+                      from kws_ent_type k
+                     where a.id = k.ent_id
+                       and k.type in
+                        <foreach collection="entTypeList" open="(" close=")" separator="," item="item">
+                            #{item}
+                         </foreach>
+                    )
+    </select>
+
+    <insert id="insert" parameterType="com.sckw.system.model.KwsEnterprise">
     insert into kws_enterprise
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">