wlxxpt / Message-parsing · 提交

转到一个项目

作者 朱兆平
提交 5a854550edd16c79cc1b16e6f2c3154c1724eadb 1 个父辈 aa4b8b0b

进港统计增加字段

内嵌 并排对比
正在显示 2 个修改的文件 包含 27 行增加 和 2 行删除
@@ -5,8 +5,15 @@ import lombok.Data; @@ -5,8 +5,15 @@ import lombok.Data;
5 @Data 5 @Data
6 public class AnalysisBaseModel { 6 public class AnalysisBaseModel {
7 7
8 - private String chinesedescription; 8 + //航班起始站中文
  9 + private String originatingstationcn;
  10 + //航班目的站中文
9 private String destinationstationcn; 11 private String destinationstationcn;
  12 + //运单起始站中文
  13 + private String originatingstationbillcn;
  14 + //运单目的站中文
  15 + private String destinationstationbillcn;
  16 +
10 private String countrydescchn; 17 private String countrydescchn;
11 private String areadescchn; 18 private String areadescchn;
12 private String waybillnosecondary; 19 private String waybillnosecondary;
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <result column="WAYBILLNOSECONDARY" property="waybillnosecondary" jdbcType="VARCHAR" /> 7 <result column="WAYBILLNOSECONDARY" property="waybillnosecondary" jdbcType="VARCHAR" />
8 <result column="SEGMENT" property="segment" jdbcType="VARCHAR" /> 8 <result column="SEGMENT" property="segment" jdbcType="VARCHAR" />
9 <result column="ORIGINATINGSTATION" property="originatingstation" jdbcType="VARCHAR" /> 9 <result column="ORIGINATINGSTATION" property="originatingstation" jdbcType="VARCHAR" />
10 - <result column="ORIGINATINGSTATIONCN" property="chinesedescription" jdbcType="VARCHAR" /> 10 + <result column="ORIGINATINGSTATIONCN" property="originatingstationcn" jdbcType="VARCHAR" />
11 <result column="DESTINATIONSTATION" property="destinationstation" jdbcType="VARCHAR" /> 11 <result column="DESTINATIONSTATION" property="destinationstation" jdbcType="VARCHAR" />
12 <result column="DESTINATIONSTATIONCN" property="destinationstationcn" jdbcType="VARCHAR" /> 12 <result column="DESTINATIONSTATIONCN" property="destinationstationcn" jdbcType="VARCHAR" />
13 <result column="TOTALWEIGHT" property="totalweight" jdbcType="VARCHAR" /> 13 <result column="TOTALWEIGHT" property="totalweight" jdbcType="VARCHAR" />
@@ -36,7 +36,9 @@ @@ -36,7 +36,9 @@
36 <result column="STATUS" property="status" jdbcType="VARCHAR" /> 36 <result column="STATUS" property="status" jdbcType="VARCHAR" />
37 <result column="ISBATCH" property="isbatch" jdbcType="VARCHAR" /> 37 <result column="ISBATCH" property="isbatch" jdbcType="VARCHAR" />
38 <result column="ORIGINATINGSTATION_BILL" property="originatingstationBill" jdbcType="VARCHAR" /> 38 <result column="ORIGINATINGSTATION_BILL" property="originatingstationBill" jdbcType="VARCHAR" />
  39 + <result column="ORIGINATINGSTATIONBILLCN" property="originatingstationbillcn" jdbcType="VARCHAR" />
39 <result column="DESTINATIONSTATION_BILL" property="destinationstationBill" jdbcType="VARCHAR" /> 40 <result column="DESTINATIONSTATION_BILL" property="destinationstationBill" jdbcType="VARCHAR" />
  41 + <result column="DESTINATIONSTATIONBILLCN" property="destinationstationbillcn" jdbcType="VARCHAR" />
40 <result column="REPORTORDER" property="reportorder" jdbcType="VARCHAR" /> 42 <result column="REPORTORDER" property="reportorder" jdbcType="VARCHAR" />
41 <result column="ISLAST" property="islast" jdbcType="VARCHAR" /> 43 <result column="ISLAST" property="islast" jdbcType="VARCHAR" />
42 <result column="SHIPPER_CODE" property="shipperCode" jdbcType="VARCHAR" /> 44 <result column="SHIPPER_CODE" property="shipperCode" jdbcType="VARCHAR" />
@@ -69,6 +71,10 @@ SELECT @@ -69,6 +71,10 @@ SELECT
69 C.CHINESEDESCRIPTION as ORIGINATINGSTATIONCN, 71 C.CHINESEDESCRIPTION as ORIGINATINGSTATIONCN,
70 T.DESTINATIONSTATION, 72 T.DESTINATIONSTATION,
71 C1.CHINESEDESCRIPTION AS DESTINATIONSTATIONCN, 73 C1.CHINESEDESCRIPTION AS DESTINATIONSTATIONCN,
  74 + T.ORIGINATINGSTATION_BILL,
  75 + CB1.CHINESEDESCRIPTION as ORIGINATINGSTATIONBILLCN,
  76 + T.DESTINATIONSTATION_BILL,
  77 + CB2.CHINESEDESCRIPTION AS DESTINATIONSTATIONBILLCN,
72 T.SHIPPER_COUNTRYCODE, 78 T.SHIPPER_COUNTRYCODE,
73 COUNTRY.COUNTRYDESCCHN, 79 COUNTRY.COUNTRYDESCCHN,
74 AREA.AREADESCCHN 80 AREA.AREADESCCHN
@@ -87,6 +93,8 @@ FROM @@ -87,6 +93,8 @@ FROM
87 M.PRODUCTNAME AS PRODUCTNAME, 93 M.PRODUCTNAME AS PRODUCTNAME,
88 M.ORIGINATINGSTATION AS ORIGINATINGSTATION, 94 M.ORIGINATINGSTATION AS ORIGINATINGSTATION,
89 M.DESTINATIONSTATION AS DESTINATIONSTATION, 95 M.DESTINATIONSTATION AS DESTINATIONSTATION,
  96 + M.ORIGINATINGSTATION_BILL AS ORIGINATINGSTATION_BILL,
  97 + M.DESTINATIONSTATION_BILL AS DESTINATIONSTATION_BILL,
90 M.SHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE 98 M.SHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE
91 FROM 99 FROM
92 ORIGINMANIFESTMASTER M UNION 100 ORIGINMANIFESTMASTER M UNION
@@ -103,6 +111,8 @@ FROM @@ -103,6 +111,8 @@ FROM
103 awbh.AWBHPRODUCTNAME AS PRODUCTNAME, 111 awbh.AWBHPRODUCTNAME AS PRODUCTNAME,
104 awbh.ORIGINATINGSTATION AS ORIGINATINGSTATION, 112 awbh.ORIGINATINGSTATION AS ORIGINATINGSTATION,
105 awbh.DESTINATIONSTATION AS DESTINATIONSTATION, 113 awbh.DESTINATIONSTATION AS DESTINATIONSTATION,
  114 + awbh.ORIGINATINGSTATION_BILL AS ORIGINATINGSTATION_BILL,
  115 + awbh.DESTINATIONSTATION_BILL AS DESTINATIONSTATION_BILL,
106 awbh.AWBHSHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE 116 awbh.AWBHSHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE
107 FROM 117 FROM
108 V_AWBA_AWBH awbh 118 V_AWBA_AWBH awbh
@@ -116,6 +126,14 @@ LEFT JOIN @@ -116,6 +126,14 @@ LEFT JOIN
116 ON 126 ON
117 C1.CITYCODE = T.DESTINATIONSTATION 127 C1.CITYCODE = T.DESTINATIONSTATION
118 LEFT JOIN 128 LEFT JOIN
  129 + TB_AIRPORTCODE CB1
  130 +ON
  131 + CB1.CITYCODE = T.ORIGINATINGSTATION_BILL
  132 +LEFT JOIN
  133 + TB_AIRPORTCODE CB2
  134 + ON
  135 + CB2.CITYCODE = T.DESTINATIONSTATION_BILL
  136 +LEFT JOIN
119 T_BAS_COUNTRY COUNTRY 137 T_BAS_COUNTRY COUNTRY
120 ON 138 ON
121 COUNTRY.COUNTRYID = T.SHIPPER_COUNTRYCODE 139 COUNTRY.COUNTRYID = T.SHIPPER_COUNTRYCODE