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

sckw-modules-api/sckw-manage-api/src/main/java/com/sckw/manage/api/RemoteManageService.java

@@ -1,6 +1,7 @@
 package com.sckw.manage.api;
 
 import com.sckw.manage.api.model.dto.res.EntAddressResDto;
+import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 
 import java.util.List;
 import java.util.Map;
@@ -21,4 +22,13 @@ public interface RemoteManageService {
      */
     Map<Long, List<EntAddressResDto>> queryEntAddressByEntIdList(List<Long> idList);
 
+    /**
+     * @param entId 当前企业id  targetEntId对方企业id  cooperateType合作关系
+     * @return  FindEntCooperateResVo
+     * @desc: 查询合作信息
+     * @author: czh
+     * @date: 2023/8/16
+     */
+    List<FindEntCooperateResVo> findEntCooperate(Long entId, Long targetEntId, Integer cooperateType);
+
 }

sckw-modules-api/sckw-manage-api/src/main/java/com/sckw/manage/api/model/dto/res/FindEntCooperateResVo.java

@@ -0,0 +1,44 @@
+package com.sckw.manage.api.model.dto.res;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author czh
+ * @desc 合作企业
+ * @date 2023/7/22
+ */
+@Data
+public class FindEntCooperateResVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -3663266782855234702L;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 企业名
+     */
+    private String entName;
+
+    /**
+     * 联系人id
+     */
+    private Long contactsId;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+}

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -6,10 +6,16 @@ import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.manage.api.RemoteManageService;
 import com.sckw.manage.api.model.dto.res.EntAddressResDto;
+import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.manage.dao.KwmAddressMapper;
 import com.sckw.manage.model.entity.KwmAddress;
+import com.sckw.manage.model.vo.req.FindEntCooperateReqVo;
+import com.sckw.manage.service.KwmCooperateManageService;
 import org.apache.dubbo.config.annotation.DubboService;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +32,9 @@ public class RemoteManageServiceImpl implements RemoteManageService {
     @Autowired
     private KwmAddressMapper kwmAddressMapper;
 
+    @Autowired
+    private KwmCooperateManageService kwmCooperateManageService;
+
     /**
      * @param idList 企业id集合
      * @return Map<Long, List<EntAddressResDto>>
@@ -47,4 +56,17 @@ public class RemoteManageServiceImpl implements RemoteManageService {
         List<EntAddressResDto> entAddressResDtoList = BeanUtils.copyToList(kwmAddressList, EntAddressResDto.class);
         return entAddressResDtoList.stream().collect(Collectors.groupingBy(EntAddressResDto::getEntId));
     }
+
+    @Override
+    public List<FindEntCooperateResVo> findEntCooperate(Long entId, Long targetEntId, Integer cooperateType) {
+        FindEntCooperateReqVo findEntCooperateReqVo = new FindEntCooperateReqVo();
+        findEntCooperateReqVo.setId(entId);
+        findEntCooperateReqVo.setCooperateType(cooperateType);
+        findEntCooperateReqVo.setTargetEntId(targetEntId);
+        List<com.sckw.manage.model.vo.res.FindEntCooperateResVo> entCooperate = kwmCooperateManageService.findEntCooperate(findEntCooperateReqVo);
+        if (CollectionUtils.isEmpty(entCooperate)) {
+            return Collections.emptyList();
+        }
+        return BeanUtils.copyToList(entCooperate, FindEntCooperateResVo.class);
+    }
 }