Merge branch 'master' into test

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -344,7 +344,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
             //总体积 立方米
             data.put("sumBomVolume", dataMap.get("sumBomVolume"));
             //成交方式
-            data.put("tradeModeName", contract.getPaymentMethod());
+            data.put("tradeModeName", contract.getTradeMethods());
             //运费
             data.put("freightPrice", BigDecimal.ZERO);//暂无
             // 保费
@@ -385,7 +385,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                     //成交单位
                     object.put("unit", product.getProductUnit());
                     //原产国（地区）
-                    object.put("countryChinese", corporation.getName());
+                    object.put("countryChinese", contract.getSellCountryName());
                     //总价与币制
                     object.put("sumPrice", "");
                     //成交单价

hx-sale/src/main/resources/mapper/documents/DocumentsProductMapper.xml

@@ -28,6 +28,6 @@
         FROM
             documents_product t1
         LEFT JOIN pack_detail_product t2 ON t1.business_id = t2.id
-        WHERE document_id = #{documentId}
+        WHERE t1.documents_id = #{documentId}
     </select>
 </mapper>