销售跟单BUG修复

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractDocumentarySelectDto.java

@@ -17,7 +17,7 @@ public class ContractDocumentarySelectDto extends BaseSelectDto {
     /**
      * 合同ID
      */
-    private Long purchaseId;
+    private Long businessId;
 
     /**
      * 跟单类型

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractDocumentaryServiceImpl.java

@@ -54,7 +54,7 @@ public class ContractDocumentaryServiceImpl extends ServiceImpl<ContractDocument
     @Override
     public Page<ContractDocumentary> getPage(ContractDocumentarySelectDto dto) {
         IWrapper<ContractDocumentary> wrapper = getWrapper();
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPurchaseId()),"purchase_id",dto.getPurchaseId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getBusinessId()),"business_id",dto.getBusinessId());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getDocumentaryType()),"documentary_type",dto.getDocumentaryType());
         wrapper.orderByDesc("cd", ContractDocumentary::getId);
         Page<ContractDocumentary> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -1904,7 +1904,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             List<EhsdPurchase> ehsdPurchaseList = ehsdPurchaseService.list(Wrappers.<EhsdPurchase>query().lambda().in(EhsdPurchase::getDataResourceId,ids));
             List<Long> purchaseIds = ehsdPurchaseList.stream().map(EhsdPurchase::getId).collect(Collectors.toList());
             //查询采购跟单列表
-            List<ContractDocumentary> contractDocumentaryList = contractDocumentaryService.list(Wrappers.<ContractDocumentary>query().lambda().in(ContractDocumentary::getBusinessId,purchaseIds));
+            List<ContractDocumentary> contractDocumentaryList = contractDocumentaryService.list(Wrappers.<ContractDocumentary>query().lambda().in(ContractDocumentary::getBusinessId,CollectionUtils.isEmpty(purchaseIds)?Arrays.asList("0"):purchaseIds));
             Map<Long,List<ContractDocumentary>> contractDocumentaryMap = contractDocumentaryList.stream().collect(Collectors.groupingBy(ContractDocumentary::getBusinessId));
             //赋值采购合同供应商
             supplierInfoService.attributeAssign(ehsdPurchaseList, EhsdPurchase::getSellCorporationId, (item, supplierInfo) -> {

hx-sale/src/main/resources/mapper/contract/ContractDocumentaryMapper.xml

@@ -15,19 +15,19 @@
         FROM
         (
             SELECT
-                t1.*,
             <if test="documentaryType neq null ">
-            (
-            SELECT
+                (
+                SELECT
                 count( 1 )
-            FROM
+                FROM
                 ehsd_purchase p
-            LEFT JOIN ehsd_documentary pd ON p.id = pd.business_id
-            WHERE
+                LEFT JOIN ehsd_documentary pd ON p.id = pd.business_id
+                WHERE
                 p.data_resource_id = t1.id
                 AND pd.documentary_type = 10
-            ) AS documentaryCount
+                ) AS documentaryCount,
             </if>
+            t1.*
             FROM
                 contract t1
             WHERE