中间合同BUG修复

hx-sale/src/main/java/com/fjhx/sale/service/intermediate/impl/IntermediateContractServiceImpl.java

@@ -63,13 +63,13 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         IWrapper<IntermediateContract> wrapper = getWrapper();
         //买方公司过滤
         wrapper.orderByDesc("d.create_time");
-        wrapper.eq(StringUtils.isNotEmpty(dto.getKeyword()),"c.code", dto.getKeyword());
+        wrapper.like(StringUtils.isNotEmpty(dto.getKeyword()),"c.code", dto.getKeyword());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getBuyCorporationId()),"c.buy_corporation_id", dto.getBuyCorporationId());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getSellCorporationId()),"c.sell_corporation_id", dto.getSellCorporationId());
         Page<IntermediateContractVo> page;
         if(dto.getIsSet()==1){//未创建
             String ids = this.getAllIds();
-            wrapper.notIn("d.id",Arrays.asList(ids));
+            wrapper.notIn("d.id",Arrays.asList(ids.split(",")));
             //卖方公司过滤
             page = this.baseMapper.getPage(dto.getPage(), wrapper);
         }else{//已创建
@@ -173,10 +173,10 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         Map<Long, Corporation> corporationMap = corporationService.mapKEntity(Corporation::getId, q -> q.in(Corporation::getId, corporationIds));
         Corporation buyCorporation = corporationMap.get(in.getBuyCorporationId());
         //赋值买方信息
-        vo.setBuyContactNumber(in.getBuyContactName());
-        vo.setBuyCorporationName(in.getBuyContactNumber());
+        vo.setBuyContactNumber(in.getBuyContactNumber());
+        vo.setBuyContactName(in.getBuyContactName());
         if (ObjectUtil.isNotEmpty(buyCorporation)) {
-            vo.setBuyContactName(buyCorporation.getNameEn());
+            vo.setBuyCorporationName(buyCorporation.getNameEn());
             //赋值买方国家省市详细地址信息
             vo.setBuyCountryName(buyCorporation.getCountryEnStr());
             vo.setBuyProvinceName(buyCorporation.getProvinceEnStr());
@@ -185,10 +185,10 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
         }
         Corporation sellCorporation = corporationMap.get(in.getSellCorporationId());
         //赋值卖方信息
-        vo.setSellContactNumber(in.getSellContactName());
-        vo.setSellCorporationNameEn(in.getSellContactNumber());
+        vo.setSellContactNumber(in.getSellContactNumber());
+        vo.setSellContactName(in.getSellContactName());
         if (ObjectUtil.isNotEmpty(sellCorporation)) {
-            vo.setSellContactName(sellCorporation.getNameEn());
+            vo.setSellCorporationNameEn(sellCorporation.getNameEn());
             //赋值卖方国家省市详细地址信息
             vo.setSellCountryName(sellCorporation.getCountryEnStr());
             vo.setSellProvinceName(sellCorporation.getProvinceEnStr());