From cb3fc9467a3643fd0edb316970b06cace9384619 Mon Sep 17 00:00:00 2001
From: hejun <hejun@sun-tech.cn>
Date: Wed, 23 Dec 2020 16:08:38 +0800
Subject: [PATCH] =?UTF-8?q?fix,=20=E4=BF=AE=E6=AD=A3=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1type=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/pid21/client/model/Enterprise.java     |  6 ++-
 .../cn/pid21/client/DataReportClientTest.java | 43 ++++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/main/java/cn/pid21/client/model/Enterprise.java b/src/main/java/cn/pid21/client/model/Enterprise.java
index 554d2f3..5f18098 100644
--- a/src/main/java/cn/pid21/client/model/Enterprise.java
+++ b/src/main/java/cn/pid21/client/model/Enterprise.java
@@ -3,8 +3,6 @@ package cn.pid21.client.model;
 import lombok.Data;
 import lombok.ToString;
 
-import java.util.Date;
-
 /**
  * Enterprise Description
  *
@@ -41,5 +39,9 @@ public class Enterprise {
      */
     private String address;
 
+    /**
+     * 企业类型
+     */
+    private String type;
 
 }
diff --git a/src/test/java/cn/pid21/client/DataReportClientTest.java b/src/test/java/cn/pid21/client/DataReportClientTest.java
index bbf4d7a..de372b2 100644
--- a/src/test/java/cn/pid21/client/DataReportClientTest.java
+++ b/src/test/java/cn/pid21/client/DataReportClientTest.java
@@ -27,7 +27,7 @@ public class DataReportClientTest {
      * @throws IOException
      */
     @Test
-        public void testCertificationRegister() throws IOException {
+    public void testCertificationRegister() throws IOException {
 
 //        //批次信息-多个批次
 //        BatchInfo batchInfo = new BatchInfo();
@@ -84,17 +84,17 @@ public class DataReportClientTest {
         batchInfo.setWeight(990);
 
         Certification certification = Certification
-            .builder()
-            .portEntry("331201")
-            .entryDate("2020-10-03") //入境日期
-            .orderNo("120000008219532001")
-            .weight(1000) //报检重量 KG
-            .batchInfoList(Lists.newArrayList(batchInfo))
-            .consignee("C贸易公司")
-            .consigner("C海外贸易公司")
-            .countryOfOrigin("601")
-            .packageType("测试")
-            .build();
+                .builder()
+                .portEntry("331201")
+                .entryDate("2020-10-03") //入境日期
+                .orderNo("120000008219532001")
+                .weight(1000) //报检重量 KG
+                .batchInfoList(Lists.newArrayList(batchInfo))
+                .consignee("C贸易公司")
+                .consigner("C海外贸易公司")
+                .countryOfOrigin("601")
+                .packageType("测试")
+                .build();
 
         //生成数据格式可选 json/xml
         String json = JacksonUtils.create("json").convert(certification);
@@ -104,7 +104,7 @@ public class DataReportClientTest {
         //执行标识注册并返回结果
         //noinspection unchecked
         String result = DataReportClient.create("", "")
-            .request(CertificationRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
+                .request(CertificationRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
 
         System.out.println("response is : " + result);
     }
@@ -174,15 +174,15 @@ public class DataReportClientTest {
         exportInfo.setToEnterprise("测试");
         exportInfo.setEnterprise("测试");
         exportInfo.setToColdStorage("测试");
-        exportInfo.setToColdStorageEnterprise("测试") ;
+        exportInfo.setToColdStorageEnterprise("测试");
         exportInfo.setColdStorage("测试");
         exportInfo.setColdStorageEnterprise("测试");
 
         StatisticalInfo statisticalInfo = StatisticalInfo
-            .builder()
-            .importInfos(importInfoList)
-            .exportInfos(Lists.newArrayList(exportInfo))
-            .build();
+                .builder()
+                .importInfos(importInfoList)
+                .exportInfos(Lists.newArrayList(exportInfo))
+                .build();
 
         //生成数据格式可选 json/xml
         String json = JacksonUtils.create("json").convert(statisticalInfo);
@@ -192,7 +192,7 @@ public class DataReportClientTest {
         //执行标识注册并返回结果
         //noinspection unchecked
         String result = DataReportClient.create("", "")
-            .request(StatisticalRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
+                .request(StatisticalRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
 
         System.out.println("response is : " + result);
     }
@@ -207,6 +207,7 @@ public class DataReportClientTest {
         enterprise.setLatitude("纬度");
         enterprise.setLongitude("经度");
         enterprise.setAddress("企业地址");
+        enterprise.setType("04");
 
         //生成数据格式可选 json/xml
         String json = JacksonUtils.create("json").convert(Lists.newArrayList(enterprise));
@@ -215,7 +216,7 @@ public class DataReportClientTest {
         //执行标识注册并返回结果
         //noinspection unchecked
         String result = DataReportClient.create("", "")
-            .request(EnterpriseRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
+                .request(EnterpriseRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
 
         System.out.println("response is : " + result);
     }
@@ -239,7 +240,7 @@ public class DataReportClientTest {
         //执行标识注册并返回结果
         //noinspection unchecked
         String result = DataReportClient.create("", "")
-            .request(ColdStorageRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
+                .request(ColdStorageRegisterRequest.builder().paramType(ParamType.JSON).params(json)).execute();
 
         System.out.println("response is : " + result);
     }
-- 
Gitee