合同拓展

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/RemoteContractService.java

@@ -1,11 +1,12 @@
 package com.sckw.contract.api;
 
 import com.sckw.contract.api.model.dto.res.*;
+import com.sckw.contract.api.model.vo.TradeContractGoodsDto;
+import com.sckw.contract.api.model.vo.TradeContractResDto;
 
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author czh
@@ -57,6 +58,21 @@ public interface RemoteContractService {
      */
     ContractLogisticsAndTradeOrderResDto queryContractByContractId(Long tradeOrderContractId,Long tradeId);
 
+    /**
+     * 查询贸易合同
+     * @param tradeContractId
+     * @return
+     */
+    TradeContractResDto queryTradeContract(Long tradeContractId,Long goodsId);
+
+    /**
+     * 查询最新的签约合同
+     * @param entId 买方企业
+     * @param goodsId
+     * @return
+     */
+    TradeContractGoodsDto queryTradeContractNew(Long entId, Long goodsId);
+
     /**
      * 查询物流合同信息
      */

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/vo/GoodsInfoDto.java

@@ -0,0 +1,36 @@
+package com.sckw.contract.api.model.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+@Data
+public class GoodsInfoDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2656035411576510101L;
+    /**
+     * 商品skuid
+     */
+    private Long skuId;
+    /**
+     * 数量
+     */
+    private BigDecimal amount;
+
+    /**
+     * 履行量
+     */
+    private BigDecimal performedAmount;
+    /**
+     * 单位（吨、方、箱、件）
+     */
+    private String unit;
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+}

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/vo/TradeContractGoodsDto.java

@@ -0,0 +1,19 @@
+package com.sckw.contract.api.model.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+@Data
+public class TradeContractGoodsDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2656035411576510101L;
+
+    private BigDecimal price;
+
+
+}

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/vo/TradeContractResDto.java

@@ -0,0 +1,85 @@
+package com.sckw.contract.api.model.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+public class TradeContractResDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2656035411576510101L;
+
+    /**
+     * 贸易合同id
+     */
+    private Long id;
+
+    /**
+     * 贸易合同名
+     */
+    private String contactName;
+
+    /**
+     * 贸易合同号
+     */
+    private String contractNo;
+
+    /**
+     * 签约方式（1线上签约、2线下签约）
+     */
+    private Integer signingWay;
+
+    /**
+     * 交易方式(1预付款、2货到付款）
+     */
+    private Integer trading;
+
+    /**
+     * 开始日期
+     */
+    private Date startTime;
+
+    /**
+     * 结束日期
+     */
+    @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
+    private Date endTime;
+    /**
+     * 数量
+     */
+    private BigDecimal amount;
+
+    /**
+     * 履行量
+     */
+    private BigDecimal performedAmount;
+    private Long contractPid;
+    private Integer status;
+    /**
+     * 结算方式
+     */
+    private Integer settlement;
+
+    /**
+     * 托运方式 1-采购方托运，2-供应方托运
+     */
+    private Integer consignment;
+    /**
+     * 卸货方式
+     */
+    private Integer unloadWay;
+
+    private GoodsInfoDto goodsInfoDto;
+    /**
+     * 贸易合同关联的企业信息
+     */
+    private List<TradeContractUnitDto> unitList;
+}

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/vo/TradeContractUnitDto.java

@@ -0,0 +1,44 @@
+package com.sckw.contract.api.model.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+@Data
+public class TradeContractUnitDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2656035411576510101L;
+    /**
+     * 单位类型（1采购单位、2销售单位）
+     */
+    private String unitType;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 企业名称
+     */
+    private String firmName;
+
+    /**
+     * 联系人id
+     */
+    private Long contactsId;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+}

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dao/KwcContractTradeMapper.java

@@ -1,6 +1,7 @@
 package com.sckw.contract.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.contract.api.model.vo.TradeContractGoodsDto;
 import com.sckw.contract.model.dto.req.QueryListReqDto;
 import com.sckw.contract.model.dto.res.QueryContractValidCountResDto;
 import com.sckw.contract.model.dto.res.QueryListResDto;
@@ -12,27 +13,28 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
-* @author PC
-* @description 针对表【kwc_contract_trade(交易合同（采购合同/销售合同）)】的数据库操作Mapper
-* @createDate 2023-07-13 13:36:19
-* @Entity com.sckw.contract.model.entity.KwcContractTrade
-*/
+ * @author PC
+ * @description 针对表【kwc_contract_trade(交易合同（采购合同/销售合同）)】的数据库操作Mapper
+ * @createDate 2023-07-13 13:36:19
+ * @Entity com.sckw.contract.model.entity.KwcContractTrade
+ */
 @Mapper
 public interface KwcContractTradeMapper extends BaseMapper<KwcContractTrade> {
 
 
     /**
+     * @return QueryListResVo
      * @desc: 查询
      * @param: reqVo
      * @author: sky
      * @date 2023/7/17
-     * @return QueryListResVo
      */
     List<QueryListResDto> queryList(QueryListReqDto reqVo);
+
     List<QueryListResDto> queryList1(QueryListReqDto reqVo);
 
     /**
-     * @param entIdList  企业id
+     * @param entIdList 企业id
      * @return QueryContractValidCountResDto
      * @desc: 查各个类型的有效合同  贸易和物流写一起算了
      * @author: czh
@@ -48,6 +50,15 @@ public interface KwcContractTradeMapper extends BaseMapper<KwcContractTrade> {
      * @date: 2023/9/13
      */
     List<QueryListResDto> queryTradeList(@Param("reqVo") QueryListReqVo reqVo, @Param("authEntIdList") List<Long> authEntIdList);
+
+    /**
+     * 当前企业，当前商品，最新的签约价
+     *
+     * @param entId
+     * @param goodsId
+     * @return
+     */
+    TradeContractGoodsDto queryNewSignPrice(@Param("entId") Long entId, @Param("goodsId") Long goodsId);
 }
 
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -1,12 +1,15 @@
 package com.sckw.contract.dubbo;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Sets;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.*;
-import com.sckw.contract.dao.KwcContractLogisticsMapper;
-import com.sckw.contract.dao.KwcContractLogisticsUnitMapper;
-import com.sckw.contract.dao.KwcContractTradeMapper;
+import com.sckw.contract.api.model.vo.GoodsInfoDto;
+import com.sckw.contract.api.model.vo.TradeContractGoodsDto;
+import com.sckw.contract.api.model.vo.TradeContractResDto;
+import com.sckw.contract.api.model.vo.TradeContractUnitDto;
+import com.sckw.contract.dao.*;
 import com.sckw.contract.model.dto.res.QueryContractValidCountResDto;
 import com.sckw.contract.model.entity.*;
 import com.sckw.contract.repository.*;
@@ -17,6 +20,7 @@ import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ContractStatusEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.SigningWayEnum;
+import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.transport.api.dubbo.TransportRemoteService;
@@ -54,13 +58,16 @@ public class RemoteContractServiceImpl implements RemoteContractService {
 
     @Autowired
     private KwcContractTradeMapper kwcContractTradeMapper;
-
+    @Autowired
+    private KwcContractTradeGoodsMapper kwcContractTradeGoodsMapper;
+    @Autowired
+    private KwcContractTradeUnitMapper kwcContractTradeUnitMapper;
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
-    private TransportRemoteService transportRemoteService ;
+    private TransportRemoteService transportRemoteService;
 
-    private final KwcContractTradeRepository kwcContractTradeRepository ;
+    private final KwcContractTradeRepository kwcContractTradeRepository;
     private final KwcContractLogisticsRepository contractLogisticsRepository;
     private final KwcContractTradeUnitRepository kwcContractTradeUnitRepository;
     private final KwcContractTradeGoodsRepository kwcContractTradeGoodsRepository;
@@ -212,11 +219,11 @@ public class RemoteContractServiceImpl implements RemoteContractService {
     }
 
     @Override
-    public ContractLogisticsAndTradeOrderResDto queryContractByContractId(Long tradeOrderContractId,Long tradeId) {
+    public ContractLogisticsAndTradeOrderResDto queryContractByContractId(Long tradeOrderContractId, Long tradeId) {
         //根据贸易合同查询贸易合同
         KwcContractTrade kwcContractTrade = kwcContractTradeRepository.queryByContractId(tradeOrderContractId);
-        if (Objects.isNull(kwcContractTrade)){
-            return new ContractLogisticsAndTradeOrderResDto() ;
+        if (Objects.isNull(kwcContractTrade)) {
+            return new ContractLogisticsAndTradeOrderResDto();
         }
         ContractLogisticsAndTradeOrderResDto contractLogisticsAndTradeOrderResDto = new ContractLogisticsAndTradeOrderResDto();
         contractLogisticsAndTradeOrderResDto.setId(kwcContractTrade.getId());
@@ -225,13 +232,13 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         //根据贸易订单id查询物流订单和物流合同关联信息
         List<LogisticContractVo> logisticContractVos = transportRemoteService.queryLogisticContractByTradeId(tradeId);
         Set<Long> logContractIds = Sets.newHashSet();
-        if (CollectionUtils.isNotEmpty(logisticContractVos)){
+        if (CollectionUtils.isNotEmpty(logisticContractVos)) {
             logContractIds =
                     logisticContractVos.stream().map(LogisticContractVo::getLogContractId).collect(Collectors.toSet());
         }
         //查询物流合同
         List<KwcContractLogistics> contractLogistics = contractLogisticsRepository.queryByLogisticContractIds(logContractIds);
-        if (CollectionUtils.isNotEmpty(contractLogistics)){
+        if (CollectionUtils.isNotEmpty(contractLogistics)) {
             List<ContractLogisticsAndTradeOrderResDto.ContractLogisticsOrder> contractLogisticsOrders = contractLogistics.stream().map(c -> {
                 ContractLogisticsAndTradeOrderResDto.ContractLogisticsOrder contractLogisticsOrder = new ContractLogisticsAndTradeOrderResDto.ContractLogisticsOrder();
                 contractLogisticsOrder.setLogisticsContractId(c.getId());
@@ -245,9 +252,38 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         return contractLogisticsAndTradeOrderResDto;
     }
 
+    @Override
+    public TradeContractResDto queryTradeContract(Long tradeContractId, Long goodsId) {
+        KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(tradeContractId);
+        if (Objects.nonNull(kwcContractTrade)) {
+            TradeContractResDto tradeContractResDto = BeanUtils.toBean(kwcContractTrade, TradeContractResDto.class);
+            tradeContractResDto.setId(kwcContractTrade.getId());
+            tradeContractResDto.setContactName(kwcContractTrade.getName());
+            tradeContractResDto.setContractNo(kwcContractTrade.getContractNo());
+            KwcContractTradeGoods kwcContractTradeGoods = kwcContractTradeGoodsMapper.selectOne(new LambdaQueryWrapper<KwcContractTradeGoods>()
+                    .eq(KwcContractTradeGoods::getContractId, tradeContractId)
+                    .eq(KwcContractTradeGoods::getGoodsId, goodsId)
+                    .eq(KwcContractTradeGoods::getDelFlag, 0)
+            );
+            Optional.ofNullable(kwcContractTradeGoods).ifPresent(d -> tradeContractResDto.setGoodsInfoDto(BeanUtils.toBean(d, GoodsInfoDto.class)));
+
+            List<KwcContractTradeUnit> kwcContractTradeUnits = kwcContractTradeUnitMapper.selectList(new LambdaQueryWrapper<KwcContractTradeUnit>().eq(KwcContractTradeUnit::getContractId, tradeContractId)
+                    .eq(KwcContractTradeUnit::getDelFlag, 0));
+            Optional.ofNullable(kwcContractTradeUnits).ifPresent(d -> tradeContractResDto.setUnitList(d.stream().map(t -> BeanUtils.toBean(t, TradeContractUnitDto.class)).toList()));
+
+            return tradeContractResDto;
+        }
+        return null;
+    }
+
+    @Override
+    public TradeContractGoodsDto queryTradeContractNew(Long entId, Long goodsId) {
+        return kwcContractTradeMapper.queryNewSignPrice(entId,goodsId);
+    }
+
     @Override
     public List<ContractLogisticsOrderResDto> queryContractLogisticsOrder(LogisticsOrderDto logisticsOrderDto) {
-        log.info("查询物流合同请求：{}",JSON.toJSONString( logisticsOrderDto));
+        log.info("查询物流合同请求：{}", JSON.toJSONString(logisticsOrderDto));
         return kwcContractTradeService.queryContractLogisticsOrder(logisticsOrderDto);
 
     }

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -283,4 +283,18 @@
         </if>
         order by a.create_time desc
     </select>
+
+    <select id="queryNewSignPrice" resultType="com.sckw.contract.api.model.vo.TradeContractGoodsDto">
+        select  a.id, b.price
+        from kwc_contract_trade a
+                 left join kwc_contract_trade_goods b on a.id = b.contract_id and b.del_flag = 0
+        <where>
+            a.del_flag = 0
+              and a.status = 0
+              and a.ent_id = #{entId}
+              and b.goods_id = #{goodsId}
+            order by a.create_time desc
+            limit 1
+        </where>
+    </select>
 </mapper>

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

@@ -4,6 +4,8 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.manage.model.vo.req.*;
 import com.sckw.manage.service.KwmAddressService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/kwmAddress")
+@Tag(name = "地址管理", description = "地址管理")
 public class KwmAddressController {
 
     @Autowired
@@ -110,7 +113,8 @@ public class KwmAddressController {
      * @return HttpResult
      */
     @PostMapping("queryByEnt")
-    public HttpResult queryByEnt(@RequestBody QueryByEntReqVo reqVo) {
+    @Operation(summary = "查询地址信息", description = "查企业下的地址")
+    public HttpResult queryByEnt(@RequestBody @Valid QueryByEntReqVo reqVo) {
         return HttpResult.ok(kwmAddressService.queryByEnt(reqVo));
     }
 

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

@@ -1,5 +1,7 @@
 package com.sckw.manage.model.vo.req;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @date 2023/7/19
  */
 @Data
+@Schema(description = "查询地址信息参数")
 public class QueryByEntReqVo implements Serializable {
 
     @Serial
@@ -19,25 +22,25 @@ public class QueryByEntReqVo implements Serializable {
     /**
      * 企业id
      */
+    @Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "企业id不能为空")
     private Long id;
 
     /**
      * 地址名称
      */
+    @Schema(description = "地址名称")
     private String name;
 
     /**
-     * 地址名
+     * 所属区域名称
      */
+    @Schema(description = "所属区域名称")
     private String cityName;
 
     /**
-     * 地址名
-     */
-    private String cityTrueName;
-
-    /**
-     * 装货卸货地点
+     * 地址类型
      */
+    @Schema(description = "地址类型")
     private Integer defaultType;
 }

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

@@ -426,9 +426,6 @@ public class KwmAddressService {
         LambdaQueryWrapper<KwmAddress> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwmAddress::getDelFlag, Global.NO);
         wrapper.eq(KwmAddress::getEntId, entCacheResDto.getId());
-        if (StringUtils.isNotBlank(reqVo.getCityTrueName())) {
-            wrapper.eq(KwmAddress::getName, reqVo.getCityTrueName());
-        }
         if (StringUtils.isNotBlank(reqVo.getName())) {
             wrapper.like(KwmAddress::getName, reqVo.getName());
         }

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

@@ -639,63 +639,52 @@ public class KwmCooperateManageService {
      * @date: 2023/7/22
      */
     public List<FindCooperateByEntResVo> findTargetEntCooperateInOur(FindCooperateByEntReqVo reqVo) {
-        FindCooperateByEntReqVo param = new FindCooperateByEntReqVo();
-        param.setEntId(reqVo.getTargetEntId());
-        param.setCooperateType(commonBusinessService.changeCooperateType(reqVo.getCooperateType()));
-        //查对方有哪些合作单位，再筛选出我方的单位（包括我方主体单位）
-        List<FindCooperateByEntResVo> cooperateByEnt = findCooperateByEnt(param);
-        if (CollectionUtils.isEmpty(cooperateByEnt)) {
-            return Collections.emptyList();
-        }
-
-        Map<Long, EntCacheResDto> longEntCacheResDtoMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(reqVo.getEntId()));
-        if (longEntCacheResDtoMap.isEmpty()) {
-            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
-        }
-
-        EntCacheResDto entCacheResDto = longEntCacheResDtoMap.get(reqVo.getEntId());
-        if (Objects.isNull(entCacheResDto)) {
-            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
-        }
-
-        List<Long> longs = new ArrayList<>();
-        longs.add(reqVo.getEntId());
-        List<EntCacheResDto> child = entCacheResDto.getChild();
-        if (CollectionUtils.isNotEmpty(child)) {
-            longs.addAll(child.stream().map(EntCacheResDto::getId).toList());
-        }
-
-        List<FindCooperateByEntResVo> findCooperateByEntResVos = cooperateByEnt.stream().filter(item -> longs.contains(item.getTargetEntId())).toList();
-        if (CollectionUtils.isEmpty(findCooperateByEntResVos)) {
-            return Collections.emptyList();
-        }
 
-        //由于是以对方单位为第一单位查，所以这里要取反一下
-        long entIdTemp;
-        long contactsId;
-        String entIdName;
-        String contacts;
-        String phone;
-        for (FindCooperateByEntResVo findCooperateByEntResVo : findCooperateByEntResVos) {
-            entIdTemp = findCooperateByEntResVo.getEntId();
-            entIdName = findCooperateByEntResVo.getEntName();
-            contactsId = findCooperateByEntResVo.getContactsId();
-            contacts = findCooperateByEntResVo.getContacts();
-            phone = findCooperateByEntResVo.getPhone();
-
-            findCooperateByEntResVo.setEntId(findCooperateByEntResVo.getTargetEntId());
-            findCooperateByEntResVo.setEntName(findCooperateByEntResVo.getTargetEntName());
-            findCooperateByEntResVo.setContactsId(findCooperateByEntResVo.getTargetContactsId());
-            findCooperateByEntResVo.setContacts(findCooperateByEntResVo.getTargetContacts());
-            findCooperateByEntResVo.setPhone(findCooperateByEntResVo.getTargetPhone());
-            findCooperateByEntResVo.setTargetEntId(entIdTemp);
-            findCooperateByEntResVo.setTargetEntName(entIdName);
-            findCooperateByEntResVo.setTargetContactsId(contactsId);
-            findCooperateByEntResVo.setTargetContacts(contacts);
-            findCooperateByEntResVo.setTargetPhone(phone);
-            findCooperateByEntResVo.setCooperateTypes(commonBusinessService.changeCooperateType(findCooperateByEntResVo.getCooperateTypes()));
-        }
-        return findCooperateByEntResVos;
+//        Map<Long, EntCacheResDto> longEntCacheResDtoMap = remoteSystemService.queryEntTreeByIds(Collections.singletonList(reqVo.getEntId()));
+//        if (longEntCacheResDtoMap.isEmpty()) {
+//            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
+//        }
+//
+//        EntCacheResDto entCacheResDto = longEntCacheResDtoMap.get(reqVo.getEntId());
+//        if (Objects.isNull(entCacheResDto)) {
+//            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
+//        }
+//
+//        List<Long> longs = new ArrayList<>();
+//        longs.add(reqVo.getEntId());
+//        List<EntCacheResDto> child = entCacheResDto.getChild();
+//        if (CollectionUtils.isNotEmpty(child)) {
+//            longs.addAll(child.stream().map(EntCacheResDto::getId).toList());
+//        }
+
+        return Collections.emptyList();
+//
+//        //由于是以对方单位为第一单位查，所以这里要取反一下
+//        long entIdTemp;
+//        long contactsId;
+//        String entIdName;
+//        String contacts;
+//        String phone;
+//        for (FindCooperateByEntResVo findCooperateByEntResVo : findCooperateByEntResVos) {
+//            entIdTemp = findCooperateByEntResVo.getEntId();
+//            entIdName = findCooperateByEntResVo.getEntName();
+//            contactsId = findCooperateByEntResVo.getContactsId();
+//            contacts = findCooperateByEntResVo.getContacts();
+//            phone = findCooperateByEntResVo.getPhone();
+//
+//            findCooperateByEntResVo.setEntId(findCooperateByEntResVo.getTargetEntId());
+//            findCooperateByEntResVo.setEntName(findCooperateByEntResVo.getTargetEntName());
+//            findCooperateByEntResVo.setContactsId(findCooperateByEntResVo.getTargetContactsId());
+//            findCooperateByEntResVo.setContacts(findCooperateByEntResVo.getTargetContacts());
+//            findCooperateByEntResVo.setPhone(findCooperateByEntResVo.getTargetPhone());
+//            findCooperateByEntResVo.setTargetEntId(entIdTemp);
+//            findCooperateByEntResVo.setTargetEntName(entIdName);
+//            findCooperateByEntResVo.setTargetContactsId(contactsId);
+//            findCooperateByEntResVo.setTargetContacts(contacts);
+//            findCooperateByEntResVo.setTargetPhone(phone);
+//            findCooperateByEntResVo.setCooperateTypes(commonBusinessService.changeCooperateType(findCooperateByEntResVo.getCooperateTypes()));
+//        }
+//        return findCooperateByEntResVos;
     }