|
|
@@ -9,10 +9,8 @@ import com.github.pagehelper.PageInfo;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
|
import com.google.common.collect.Sets;
|
|
|
-import com.sckw.contract.api.model.dto.res.ContractLogisticsOrderResDto;
|
|
|
-import com.sckw.contract.api.model.dto.res.ContractTradeOrderDto;
|
|
|
-import com.sckw.contract.api.model.dto.res.ContractTradeOrderInfo;
|
|
|
-import com.sckw.contract.api.model.dto.res.LogisticsOrderDto;
|
|
|
+import com.sckw.contract.api.model.dto.req.TradeEntListQueryFeignDto;
|
|
|
+import com.sckw.contract.api.model.dto.res.*;
|
|
|
import com.sckw.contract.api.model.vo.LogisticsEntDtoVO;
|
|
|
import com.sckw.contract.api.model.vo.LogisticsGoodsDto;
|
|
|
import com.sckw.contract.api.model.vo.TradeContractUnitDto;
|
|
|
@@ -1893,6 +1891,34 @@ public class KwcContractTradeService {
|
|
|
return records.size();
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ public List<TradeEntInfoResVo> queryTradeEntList(TradeEntListQueryFeignDto queryFeignDto) {
|
|
|
+ List<TradeEntInfoResVo> resVos = new ArrayList<>();
|
|
|
+ Long entId = queryFeignDto.getCurEntId();
|
|
|
+ Set<Long> entIds = Sets.newHashSet();
|
|
|
+ entIds.add(entId);
|
|
|
+ Set<Long> contractIds = null;
|
|
|
+ if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(entIds)) {
|
|
|
+ List<KwcContractTradeUnit> units = kwcContractTradeUnitRepository.queryByEntIds(entIds);
|
|
|
+ if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(units)) {
|
|
|
+ contractIds = units.stream()
|
|
|
+ .map(KwcContractTradeUnit::getContractId)
|
|
|
+ .collect(Collectors.toSet());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (org.apache.commons.collections4.CollectionUtils.isEmpty(contractIds)) {
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+ List<KwcContractTradeUnit> tradeUnits = kwcContractTradeUnitRepository.queryByContractIdsAndEntType(contractIds, queryFeignDto.getTradeEntType());
|
|
|
+ for (KwcContractTradeUnit tradeUnit : tradeUnits) {
|
|
|
+ TradeEntInfoResVo resVo = new TradeEntInfoResVo();
|
|
|
+ resVo.setEntId(tradeUnit.getEntId());
|
|
|
+ resVo.setEntName(tradeUnit.getFirmName());
|
|
|
+ resVos.add(resVo);
|
|
|
+ }
|
|
|
+ return resVos;
|
|
|
+ }
|
|
|
+
|
|
|
@NotNull
|
|
|
private static QueryListResVo getQueryListResVo(KwcContractTrade t,
|
|
|
Map<String, KwcContractTradeUnit> finalContractUnitTypeKeyAndUnitMap,
|