订单需要的接口

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/QueryListReqVo.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 @Data
 public class QueryListReqVo extends PageRequest implements Serializable {

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/controller/KwmAddressController.java

@@ -101,4 +101,16 @@ public class KwmAddressController {
         kwmAddressService.export(reqVo);
     }
 
+    /**
+     * @desc: 查企业下的地址
+     * @param: reqVo 企业id
+     * @author: czh
+     * @date 2023/7/18
+     * @return HttpResult
+     */
+    @PostMapping("queryByEnt")
+    public HttpResult queryByEnt(@RequestBody IdsReqVo reqVo) throws SystemException {
+        return HttpResult.ok(kwmAddressService.queryByEnt(reqVo.getId()));
+    }
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/IdsReqVo.java

@@ -23,4 +23,5 @@ public class IdsReqVo implements Serializable {
     @NotBlank(message = "id不能为空")
     private String ids;
 
+    private Long id;
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -24,6 +24,7 @@ import com.sckw.manage.model.vo.res.AddressQueryResVo;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -77,6 +78,19 @@ public class KwmAddressService {
             return Collections.emptyList();
         }
 
+        List<AddressQueryResVo> list = getAddressQueryResVo(kwmAddresses);
+        return list;
+    }
+
+
+    /**
+     * @desc: 转换成vo
+     * @param: kwmAddresses 实体
+     * @author: czh
+     * @date 2023/7/18
+     * @return AddressQueryResVo
+     */
+    private List<AddressQueryResVo> getAddressQueryResVo(List<KwmAddress> kwmAddresses) {
         List<AddressQueryResVo> list = new ArrayList<>();
         List<Long> userIds = kwmAddresses.stream().map(KwmAddress::getCreateBy).distinct().toList();
         List<Long> types = kwmAddresses.stream().map(KwmAddress::getType).distinct().toList();
@@ -205,4 +219,22 @@ public class KwmAddressService {
             throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_014);
         }
     }
+
+    /**
+     * @desc: 查企业下的地址
+     * @param: reqVo 企业id
+     * @author: czh
+     * @date 2023/7/18
+     * @return AddressQueryResVo
+     */
+    public List<AddressQueryResVo> queryByEnt(Long id) {
+        LambdaQueryWrapper<KwmAddress> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwmAddress::getEntId, id);
+        wrapper.eq(KwmAddress::getDelFlag, Global.NO);
+        List<KwmAddress> kwmAddresses = kwmAddressMapper.selectList(wrapper);
+        if (CollectionUtils.isEmpty(kwmAddresses)) {
+            return Collections.emptyList();
+        }
+        return getAddressQueryResVo(kwmAddresses);
+    }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -201,4 +201,16 @@ public class KwsEnterpriseController {
         return null;
     }
 
+
+    /**
+     * @desc: 查企业下的员工
+     * @param: reqVo 企业id
+     * @author: czh
+     * @date 2023/7/18
+     * @return HttpResult
+     */
+    @PostMapping("findEntUser")
+    public HttpResult findEntUser(@RequestBody IdReqVo reqVo) {
+        return HttpResult.ok(kwsEntService.findEntUser(reqVo.getId()));
+    }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -8,6 +8,7 @@ import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.vo.req.IdReqVo;
 import com.sckw.system.model.vo.req.QueryEntUserReqVo;
 import com.sckw.system.model.vo.req.ResetPasswordReqVo;
 import com.sckw.system.model.vo.req.UserAddReqVo;
@@ -159,7 +160,6 @@ public class KwsUserController {
         return HttpResult.ok(HttpStatus.MSG_005);
     }
 
-
     @PostMapping("testEdit")
     public HttpResult testEdit() {
         return HttpResult.ok(kwsUserService.test());

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

@@ -7,6 +7,7 @@ import com.sckw.system.model.pojo.FindEntUserPojo;
 import com.sckw.system.model.pojo.FindManagePojo;
 import com.sckw.system.model.pojo.FindPojoParam;
 import com.sckw.system.model.vo.req.EntFindPageReqVo;
+import com.sckw.system.model.vo.res.FindListReqVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -63,7 +64,7 @@ public interface KwsEnterpriseDao {
      * @param params
      * @return
      */
-    List<KwsEnterprise> findList(EntFindPageReqVo params);
+    List<KwsEnterprise> findList(FindListReqVo params);
 
     /**
      * 查询

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/FindListReqVo.java

@@ -0,0 +1,29 @@
+package com.sckw.system.model.vo.res;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class FindListReqVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 8883696139247219895L;
+
+    /**
+     * 企业类型
+     */
+    private Integer entType;
+
+    /**
+     * 审批状态
+     */
+    private Integer approval;
+
+    /**
+     * 企业名
+     */
+    private String entName;
+
+}

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

@@ -25,10 +25,7 @@ import com.sckw.system.model.pojo.FindEntUserPojo;
 import com.sckw.system.model.pojo.FindManagePojo;
 import com.sckw.system.model.pojo.FindPojoParam;
 import com.sckw.system.model.vo.req.*;
-import com.sckw.system.model.vo.res.CertificateResVo;
-import com.sckw.system.model.vo.res.EntDetailResVo;
-import com.sckw.system.model.vo.res.EntFindPageResVo;
-import com.sckw.system.model.vo.res.FindListGroupResVo;
+import com.sckw.system.model.vo.res.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -263,7 +260,7 @@ public class KwsEnterpriseService {
      * @author: czh
      * @date: 2023/6/9
      */
-    public List<KwsEnterprise> findList(EntFindPageReqVo reqVo) {
+    public List<KwsEnterprise> findList(FindListReqVo reqVo) {
         return kwsEnterpriseDao.findList(reqVo);
     }
 
@@ -635,4 +632,7 @@ public class KwsEnterpriseService {
         return entDetailResVo;
     }
 
+    public List<FindEntUserPojo> findEntUser(long id) {
+        return kwsEnterpriseDao.findUserByEntIds(Collections.singletonList(id));
+    }
 }

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

@@ -15,6 +15,7 @@ import com.sckw.system.dubbo.RemoteSystemServiceImpl;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindEntListPojo;
 import com.sckw.system.model.vo.req.*;
+import com.sckw.system.model.vo.res.FindListReqVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.K;
@@ -105,9 +106,9 @@ public class KwsUserService {
      */
     @Transactional(rollbackFor = {})
     public RegisterResDto register(RegisterReqDto reqDto) throws SystemException {
-        EntFindPageReqVo entFindPageReqVo = new EntFindPageReqVo();
-        entFindPageReqVo.setFirmName(reqDto.getEntName());
-        List<KwsEnterprise> list = kwsEnterpriseDao.findList(entFindPageReqVo);
+        FindListReqVo findListReqVo = new FindListReqVo();
+        findListReqVo.setEntName(reqDto.getEntName());
+        List<KwsEnterprise> list = kwsEnterpriseDao.findList(findListReqVo);
         if (!CollectionUtils.isEmpty(list)) {
             throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ENT_EXISTS);
         }
@@ -581,4 +582,5 @@ public class KwsUserService {
         remoteSystemService.queryEntTreeByIds(Collections.singletonList(Long.parseLong("156382319450525696")));
         return "";
     }
+
 }

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

@@ -144,23 +144,14 @@
     select a.*
       from kws_enterprise a
     where a.del_flag = 0
-    <if test="firmName != null and firmName != ''">
-      and a.firm_name = #{firmName}
-    </if>
-    <if test="contacts != null and contacts != ''">
-      and a.contacts = #{contacts}
-    </if>
-    <if test="phone != null and phone != ''">
-      and a.phone = #{phone}
-    </if>
-    <if test="legalName != null and legalName != ''">
-      and a.legal_name = #{legalName}
-    </if>
-    <if test="legalPhone != null and legalPhone != ''">
-      and a.legal_phone = #{legalPhone}
-    </if>
     <if test="approval != null">
       and a.approval = #{approval}
+    </if>
+      <if test="entName != null and entName != ''">
+        and a.firm_name = #{entName}
+      </if>
+    <if test="entType != null">
+      and exists (select 1 from kws_ent_type b where a.id = b.ent_id and b.type = #{entType})
     </if>
     order by a.create_time
   </select>