完成基本查询业务

@@ -16,9 +16,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableEurekaClient
 @EnableTransactionManagement
 public class CgonmsProvideApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(CgonmsProvideApplication.class, args);
     }
-
 }

+package com.sunyo.wlpt.cgonms.provide.controller;
+
+import com.sunyo.wlpt.cgonms.provide.domain.*;
+import com.sunyo.wlpt.cgonms.provide.service.*;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 14:58
+ */
+
+@CrossOrigin
+@RequestMapping("cgonms")
+@RestController
+public class CgoNmsController {
+    @Resource
+    private ResultExitDataService resultExitDataService;
+
+    @Resource
+    private PrepareMasterService prepareMasterService;
+
+    @Resource
+    private BasAirportService basAirportService;
+
+    @Resource
+    private TbAirportCodeService tbAirportCodeService;
+
+    @Resource
+    private BasAreaService basAreaService;
+
+    /**
+     * 根据航班日期获取出新舱单服务中的响应数据
+     *
+     * @param flightDate 航班日期
+     * @return {@link ResultExitData}
+     */
+    @GetMapping("/getData")
+    public List<ResultExitData> getData(
+            @RequestParam(value = "flightDate", required = false) Date flightDate,
+            @RequestParam(value = "flightNo", required = false) String flightNo) {
+
+        //设置查询条件
+        ResultExitData resultExitData = new ResultExitData();
+        resultExitData.setFlightDate(flightDate);
+        resultExitData.setFlightNo(flightNo);
+        /**
+         * 1.先获取出 新舱单——理货信息 中的相应数据
+         *
+         *  运单号; 航班号; 航班日期; 航班起始站; 航班目的站
+         *  航段(在数据库里面为null,所以只能 起始站 > 目的站 )
+         *  理货件数; 理货重量
+         */
+
+        List<ResultExitData> resultList = resultExitDataService.getResultExitDataInfo(resultExitData);
+        //遍历获取出所有需要的信息
+        for (int i = 0; i < resultList.size(); i++) {
+            ResultExitData result = resultList.get(i);
+            //设置航班
+            result.setSegment(result.getOriginatingStation() + " — " + result.getDestinationStation());
+
+            /**
+             * 2.根据  理货信息 中的运单号，获取预配表中的相应数据
+             *
+             * 承运人二字码
+             * 发货人名称
+             * 收货人名称
+             */
+            System.out.println(result.getWaybillNoMaster());
+            PrepareMaster pm = prepareMasterService.getPrepareMasterInfo(result.getWaybillNoMaster());
+
+            //发货人名称
+            result.setShipperName(pm.getShipperName());
+            //收货人名称
+            result.setConsigneeName(pm.getConsigneeName());
+            //承运人二字码
+            result.setCarrier(pm.getCarrier());
+            /**
+             * 3.根据 理货信息 中的目的站代码，获取 新舱单机场代码表 中的相应数据
+             *
+             *  机场所属城市代码
+             */
+            System.out.println(result.getDestinationStation());
+            BasAirport ba = basAirportService.getBasAirportInfo(result.getDestinationStation());
+
+            /**
+             * 4.根据 新舱单机场代码表 中的 机场所属城市代码 ，获取 天博——机场代码表 的相应数据
+             *
+             * 城市代码
+             * 区域id
+             * 国家代码
+             */
+            System.out.println(ba.getCityId());
+            TbAirportCode ta = tbAirportCodeService.getTbAirportCodeInfo(ba.getCityId());
+            // 航班目的城市代码
+            result.setCityCode(ta.getCityCode());
+            // 所属国家
+            result.setCountry(ta.getCountry());
+
+            /**
+             * 5.根据 天博——机场代码表 中的 区域id，获取 新舱单——区域代码表 的相应数据
+             *
+             * 区域id
+             * 国际国内标识；1，国外；2，国内
+             * 区域描述，中文
+             */
+            System.out.println(ta.getArea());
+            BasArea basArea = basAreaService.getBasAreaInfo(ta.getArea());
+            //航班目的区域，中文描述，所属洲
+            result.setAreaDescChn(basArea.getAreaDescChn());
+        }
+        return resultList;
+    }
+
+}

+package com.sunyo.wlpt.cgonms.provide.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author 子诚
+ * Description：实体类：新舱单机场代码表
+ * 时间：2020/5/20 11:28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BasAirport implements Serializable {
+
+    private static final long serialVersionUID = -5011627541236150393L;
+
+    /**
+     * 机场站代码
+     */
+    private String airportId;
+    /**
+     * 机场所属城市代码
+     */
+    private String cityId;
+
+
+    /**
+     * 我也不知道啥意思
+     * 机场4代码
+     */
+    private String airport4Code;
+
+    /**
+     * 机场描述，中文
+     */
+    private String airportDescChn;
+
+    /**
+     * 机场描述，英文
+     */
+    private String airportDescEng;
+
+    /**
+     * 操作时间
+     */
+    private Date operationTime;
+}

+package com.sunyo.wlpt.cgonms.provide.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author 子诚
+ * Description：实体类：新舱单——区域代码表
+ * 时间：2020/5/20 11:47
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BasArea implements Serializable {
+
+    private static final long serialVersionUID = -1060565664409722759L;
+
+    /**
+     * 区域id
+     */
+    private String areaId;
+
+    /**
+     * 国际国内标识；1，国外；2，国内
+     */
+    private String netId;
+
+    /**
+     * 区域描述，中文
+     */
+    private String areaDescChn;
+
+    private String areaDescEng;
+
+    private Date operationTime;
+
+}

+package com.sunyo.wlpt.cgonms.provide.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author 子诚
+ * Description：实体类：新舱单——预配表
+ * 时间：2020/5/20 11:12
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PrepareMaster implements Serializable {
+
+    private static final long serialVersionUID = 7073373008863847070L;
+
+    /**
+     * id
+     */
+    private String autoId;
+    /**
+     * 承运人二字码
+     */
+    private String carrier;
+
+    /**
+     * 发货人名称
+     */
+    private String shipperName;
+
+    /**
+     * 收货人名称
+     */
+    private String consigneeName;
+
+    /**
+     * 运单号
+     */
+    private String waybillNoMaster;
+
+    /**
+     * 航班号
+     */
+    private String flightNo;
+
+    /**
+     * 航班日期
+     */
+    private Date flightDate;
+
+    /**
+     * 航班起始站
+     */
+    private String originatingStation;
+
+    /**
+     * 航班目的站
+     */
+    private String destinationStation;
+
+
+
+    private String totalWeight;
+
+    private String totalPiece;
+
+    /**
+     * 预配，理货件数
+     */
+    private String prepareTotalPiece;
+
+    /**
+     * 预配，理货重量
+     */
+    private String prepareTotalWeight;
+
+    private Date stowageDate;
+
+    private String status;
+
+    private String customsStatus;
+
+    private String payMode;
+
+    private String customsCode;
+
+    /**
+     * 代理人代码
+     */
+    private String agentCode;
+
+    /**
+     * 代理人姓名
+     */
+    private String agentName;
+
+    private String shipperCity;
+
+    private String shipperAddress;
+
+    private String consigneeCity;
+
+    private String consigneeAddress;
+
+    private String receiptInformation;
+
+    private Date createDate;
+
+    private String productName;
+
+    private String shipperCode;
+
+    private String shipperCountrycode;
+
+    private String shipperPhone;
+
+    private String shipperFax;
+
+    private String consigneeCode;
+
+    private String consigneeCountrycode;
+
+    private String consigneeFax;
+
+    private String consigneePhone;
+
+    private String shipperAeo;
+
+    private String consigneeAeo;
+
+    private String unloadingStation;
+
+}

+package com.sunyo.wlpt.cgonms.provide.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author 子诚
+ * Description：实体类：新舱单——理货信息.最终返回结果类
+ * 时间：2020/5/20 10:40
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ResultExitData implements Serializable {
+
+    private static final long serialVersionUID = -260680809813827352L;
+
+    /**
+     * id
+     */
+    private String autoId;
+
+    /**
+     * 运单号
+     */
+    private String waybillNoMaster;
+
+    /**
+     * 航班号
+     */
+    private String flightNo;
+
+    /**
+     * 航班日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date flightDate;
+
+    /**
+     * 航班时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date dischargeDate;
+
+    /**
+     * 航段
+     */
+    private String segment;
+
+    /**
+     * 航班起始站
+     */
+    private String originatingStation;
+
+    /**
+     * 航班目的站
+     */
+    private String destinationStation;
+
+    /**
+     * 理货件数
+     */
+    private String tallyTotalPiece;
+
+    /**
+     * 理货重量
+     */
+    private String tallyTotalWeight;
+
+    /**
+     * 承运人二字码
+     */
+    private String carrier;
+
+    /**
+     * 发货人名称
+     */
+    private String shipperName;
+
+    /**
+     * 收货人名称
+     */
+    private String consigneeName;
+
+    /**
+     * 航班目的城市代码
+     */
+    private String cityCode;
+    /**
+     * 国家代码
+     */
+    private String country;
+
+    /**
+     * 航班目的区域，中文描述，所属洲
+     */
+    private String areaDescChn;
+
+    private String tcdName;
+
+    private String tcdTypeCode;
+
+    private String tallType;
+
+    private String oName;
+
+    private String fdName;
+
+    private String totalWeight;
+
+    private String totalGrossWeightMeasureuc;
+
+    private String totalPiece;
+
+    private String grossWeightMeasureuc;
+
+    private Date loadStartTime;
+
+    private Date loadEndTime;
+
+    private String status;
+
+    private String customsCode;
+
+    private String productName;
+
+    private String receiptInformation;
+
+    private Date createDate;
+
+    private String dealFlag;
+
+    private String billTallyFlag;
+
+    private Date dealTime;
+
+    private String transportSplitDescription;
+
+}

-package com.sunyo.wlpt.cgonms.provide.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author 子诚
- * Description：
- * 时间：2020/5/19 18:15
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Tallymaster implements Serializable {
-
-    private static final long serialVersionUID = 4102023605187440591L;
-
-    private String autoid;
-
-    private String waybillnomaster;
-
-    private String tcdName;
-
-    private String tcdTypecode;
-
-    private String talltype;
-
-    private String flightno;
-
-    private Date flightdate;
-
-    private String segment;
-
-    private String originatingstation;
-
-    private String oName;
-
-    private String destinationstation;
-
-    private String fdName;
-
-    private String totalweight;
-
-    private String totalgrossweightmeasureuc;
-
-    private String totalpiece;
-
-    private String tallytotalpiece;
-
-    private String tallytotalweight;
-
-    private String grossweightmeasureuc;
-
-    private Date loadstarttime;
-
-    private Date loadendtime;
-
-    private String status;
-
-    private String customscode;
-
-    private String productname;
-
-    private Date dischargedate;
-
-    private String receiptinformation;
-
-    private Date createdate;
-
-    private String dealFlag;
-
-    private String billTallyFlag;
-
-    private Date dealTime;
-
-    private String transportsplitdescription;
-}

+package com.sunyo.wlpt.cgonms.provide.domain;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author 子诚
+ * Description：实体类：天博——机场代码表
+ * 时间：2020/5/20 11:41
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TbAirportCode implements Serializable {
+
+    private static final long serialVersionUID = -5787801791887231439L;
+
+    /**
+     * 城市代码
+     */
+    private String cityCode;
+
+    /**
+     * 区域id
+     */
+    private String area;
+
+    /**
+     * 国家代码
+     */
+    private String country;
+
+    private String civilCode;
+
+    private String chineseDescription;
+
+    private String englishDescription;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 时区
+     */
+    private String timeZone;
+
+}

 package com.sunyo.wlpt.cgonms.provide.mapper;
 
+import com.sunyo.wlpt.cgonms.provide.domain.BasAirport;
+
 /**
  * @author 子诚
  * Description：
- * 时间：2020/5/19 18:15
+ * 时间：2020/5/20 11:28
  */
-public interface TallymasterMapper {
-}
\ No newline at end of file
+public interface BasAirportMapper {
+    /**
+     * 获取 新舱单机场代码表 中的相应数据
+     *
+     * @param destinationStation 航班目的站
+     * @return {@link BasAirport}
+     */
+    BasAirport getBasAirportInfo(String destinationStation);
+}

+package com.sunyo.wlpt.cgonms.provide.mapper;
+
+import com.sunyo.wlpt.cgonms.provide.domain.BasArea;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:47
+ */
+public interface BasAreaMapper {
+    /**
+     * 获取 新舱单——区域代码表 的相应数据.
+     *
+     * @param area 区域id
+     * @return {@link BasArea}
+     */
+    BasArea getBasAreaInfo(String area);
+}

+package com.sunyo.wlpt.cgonms.provide.mapper;
+
+import com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:12
+ */
+public interface PrepareMasterMapper {
+    /**
+     * 获取预配表中的相应数据.
+     *
+     * @param waybillNoMaster 运单号
+     * @return {@link PrepareMaster}
+     */
+    PrepareMaster getPrepareMasterInfo(String waybillNoMaster);
+}

+package com.sunyo.wlpt.cgonms.provide.mapper;
+
+import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 10:40
+ */
+public interface ResultExitDataMapper {
+    /**
+     * 获取 新舱单——理货信息 中的相应数据.
+     *
+     * @param resultExitData
+     * @return {@link ResultExitData}
+     */
+    List<ResultExitData> getResultExitDataInfo(ResultExitData resultExitData);
+
+
+}

+package com.sunyo.wlpt.cgonms.provide.mapper;
+
+import com.sunyo.wlpt.cgonms.provide.domain.TbAirportCode;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:41
+ */
+public interface TbAirportCodeMapper {
+    /**
+     * 获取 天博——机场代码表 的相应数据.
+     *
+     * @param cityId 城市id
+     * @return {@link TbAirportCode}
+     */
+    TbAirportCode getTbAirportCodeInfo(String cityId);
+}

 package com.sunyo.wlpt.cgonms.provide.service;
 
+import com.sunyo.wlpt.cgonms.provide.domain.BasAirport;
+
 /**
  * @author 子诚
  * Description：
- * 时间：2020/5/19 18:13
+ * 时间：2020/5/20 11:28
  */
-public interface TallymasterService {
-
+public interface BasAirportService {
 
+    /**
+     * 获取 新舱单机场代码表 中的相应数据
+     *
+     * @param destinationStation 航班目的站
+     * @return {@link BasAirport}
+     */
+    BasAirport getBasAirportInfo(String destinationStation);
 }
-

+package com.sunyo.wlpt.cgonms.provide.service;
+
+import com.sunyo.wlpt.cgonms.provide.domain.BasArea;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:47
+ */
+public interface BasAreaService {
+
+    /**
+     * 获取 新舱单——区域代码表 的相应数据.
+     *
+     * @param area 区域id
+     * @return {@link BasArea}
+     */
+    BasArea getBasAreaInfo(String area);
+}

+package com.sunyo.wlpt.cgonms.provide.service;
+
+import com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:12
+ */
+public interface PrepareMasterService {
+
+    /**
+     * 获取预配表中的相应数据.
+     *
+     * @param waybillNoMaster 运单号
+     * @return {@link PrepareMaster}
+     */
+    PrepareMaster getPrepareMasterInfo(String waybillNoMaster);
+}

+package com.sunyo.wlpt.cgonms.provide.service;
+
+import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
+
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 10:36
+ */
+public interface ResultExitDataService {
+
+
+    /**
+     * 获取 新舱单——理货信息 中的相应数据.
+     *
+     * @param resultExitData
+     * @return {@link ResultExitData}
+     */
+    List<ResultExitData> getResultExitDataInfo(ResultExitData resultExitData);
+
+}
+

+package com.sunyo.wlpt.cgonms.provide.service;
+
+import com.sunyo.wlpt.cgonms.provide.domain.TbAirportCode;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:41
+ */
+public interface TbAirportCodeService {
+
+    /**
+     * 获取 天博——机场代码表 的相应数据.
+     *
+     * @param cityId 城市id
+     * @return {@link TbAirportCode}
+     */
+    TbAirportCode getTbAirportCodeInfo(String cityId);
+}

 package com.sunyo.wlpt.cgonms.provide.service.impl;
 
+import com.sunyo.wlpt.cgonms.provide.domain.BasAirport;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import com.sunyo.wlpt.cgonms.provide.mapper.TallymasterMapper;
-import com.sunyo.wlpt.cgonms.provide.service.TallymasterService;
-
+import com.sunyo.wlpt.cgonms.provide.mapper.BasAirportMapper;
+import com.sunyo.wlpt.cgonms.provide.service.BasAirportService;
 /**
  * @author 子诚
  * Description：
- * 时间：2020/5/19 18:13
+ * 时间：2020/5/20 11:28
  */
 @Service
-public class TallymasterServiceImpl implements TallymasterService {
+public class BasAirportServiceImpl implements BasAirportService {
 
     @Resource
-    private TallymasterMapper tallymasterMapper;
+    private BasAirportMapper BasAirportMapper;
 
+    @Override
+    public BasAirport getBasAirportInfo(String destinationStation) {
+        return BasAirportMapper.getBasAirportInfo(destinationStation);
+    }
 }
-

+package com.sunyo.wlpt.cgonms.provide.service.impl;
+
+import com.sunyo.wlpt.cgonms.provide.domain.BasArea;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+import com.sunyo.wlpt.cgonms.provide.mapper.BasAreaMapper;
+import com.sunyo.wlpt.cgonms.provide.service.BasAreaService;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:47
+ */
+@Service
+public class BasAreaServiceImpl implements BasAreaService {
+
+    @Resource
+    private BasAreaMapper basAreaMapper;
+
+    @Override
+    public BasArea getBasAreaInfo(String area) {
+        return basAreaMapper.getBasAreaInfo(area);
+    }
+}

+package com.sunyo.wlpt.cgonms.provide.service.impl;
+
+import com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import com.sunyo.wlpt.cgonms.provide.mapper.PrepareMasterMapper;
+import com.sunyo.wlpt.cgonms.provide.service.PrepareMasterService;
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:12
+ */
+@Service
+public class PrepareMasterServiceImpl implements PrepareMasterService{
+
+    @Resource
+    private PrepareMasterMapper prepareMasterMapper;
+
+    @Override
+    public PrepareMaster getPrepareMasterInfo(String waybillNoMaster) {
+        return prepareMasterMapper.getPrepareMasterInfo(waybillNoMaster);
+    }
+}

+package com.sunyo.wlpt.cgonms.provide.service.impl;
+
+import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import com.sunyo.wlpt.cgonms.provide.mapper.ResultExitDataMapper;
+import com.sunyo.wlpt.cgonms.provide.service.ResultExitDataService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 10:36
+ */
+@Service
+public class ResultExitDataServiceImpl implements ResultExitDataService {
+
+    @Resource
+    private ResultExitDataMapper resultExitDataMapper;
+
+    @Override
+    public List<ResultExitData> getResultExitDataInfo( ResultExitData resultExitData) {
+        return resultExitDataMapper.getResultExitDataInfo(resultExitData);
+    }
+}
+

+package com.sunyo.wlpt.cgonms.provide.service.impl;
+
+import com.sunyo.wlpt.cgonms.provide.domain.TbAirportCode;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import com.sunyo.wlpt.cgonms.provide.mapper.TbAirportCodeMapper;
+import com.sunyo.wlpt.cgonms.provide.service.TbAirportCodeService;
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/5/20 11:41
+ */
+@Service
+public class TbAirportCodeServiceImpl implements TbAirportCodeService{
+
+    @Resource
+    private TbAirportCodeMapper tbAirportCodeMapper;
+
+    @Override
+    public TbAirportCode getTbAirportCodeInfo(String cityId) {
+        return tbAirportCodeMapper.getTbAirportCodeInfo(cityId);
+    }
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sunyo.wlpt.cgonms.provide.mapper.BasAirportMapper">
+    <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.BasAirport">
+        <!--@mbg.generated-->
+        <!--@Table T_BAS_AIRPORT-->
+        <result column="AIRPORTID" jdbcType="VARCHAR" property="airportId"/>
+        <result column="AIRPORT4CODE" jdbcType="CHAR" property="airport4Code"/>
+        <result column="CITYID" jdbcType="VARCHAR" property="cityId"/>
+        <result column="AIRPORTDESCCHN" jdbcType="VARCHAR" property="airportDescChn"/>
+        <result column="AIRPORTDESCENG" jdbcType="VARCHAR" property="airportDescEng"/>
+        <result column="OPERATIONTIME" jdbcType="TIMESTAMP" property="operationTime"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        AIRPORTID, AIRPORT4CODE, CITYID, AIRPORTDESCCHN, AIRPORTDESCENG, OPERATIONTIME
+    </sql>
+    <select id="getBasAirportInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from T_BAS_AIRPORT
+        where
+        AIRPORTID = #{destinationStation,jdbcType=VARCHAR}
+    </select>
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sunyo.wlpt.cgonms.provide.mapper.BasAreaMapper">
+    <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.BasArea">
+        <!--@mbg.generated-->
+        <!--@Table T_BAS_AREA-->
+        <result column="AREAID" jdbcType="VARCHAR" property="areaId"/>
+        <result column="NETID" jdbcType="VARCHAR" property="netId"/>
+        <result column="AREADESCCHN" jdbcType="VARCHAR" property="areaDescChn"/>
+        <result column="AREADESCENG" jdbcType="VARCHAR" property="areaDescEng"/>
+        <result column="OPERATIONTIME" jdbcType="TIMESTAMP" property="operationTime"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        AREAID, NETID, AREADESCCHN, AREADESCENG, OPERATIONTIME
+    </sql>
+    <select id="getBasAreaInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from T_BAS_AREA
+        where AREAID = #{area,jdbcType=VARCHAR}
+    </select>
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sunyo.wlpt.cgonms.provide.mapper.PrepareMasterMapper">
+    <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster">
+        <!--@mbg.generated-->
+        <!--@Table PREPAREMASTER-->
+        <result column="AUTOID" jdbcType="VARCHAR" property="autoId"/>
+        <result column="FLIGHTNO" jdbcType="VARCHAR" property="flightNo"/>
+        <result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightDate"/>
+        <result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingStation"/>
+        <result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationStation"/>
+        <result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillNoMaster"/>
+        <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>
+        <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>
+        <result column="PREPARETOTALPIECE" jdbcType="VARCHAR" property="prepareTotalPiece"/>
+        <result column="PREPARETOTALWEIGHT" jdbcType="VARCHAR" property="prepareTotalWeight"/>
+        <result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowageDate"/>
+        <result column="STATUS" jdbcType="VARCHAR" property="status"/>
+        <result column="CARRIER" jdbcType="VARCHAR" property="carrier"/>
+        <result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsStatus"/>
+        <result column="PAYMODE" jdbcType="VARCHAR" property="payMode"/>
+        <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>
+        <result column="AGENTCODE" jdbcType="VARCHAR" property="agentCode"/>
+        <result column="AGENTNAME" jdbcType="VARCHAR" property="agentName"/>
+        <result column="SHIPPERNAME" jdbcType="VARCHAR" property="shipperName"/>
+        <result column="SHIPPERCITY" jdbcType="VARCHAR" property="shipperCity"/>
+        <result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperAddress"/>
+        <result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneeName"/>
+        <result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneeCity"/>
+        <result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeAddress"/>
+        <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>
+        <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>
+        <result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode"/>
+        <result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode"/>
+        <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone"/>
+        <result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax"/>
+        <result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode"/>
+        <result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode"/>
+        <result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax"/>
+        <result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone"/>
+        <result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo"/>
+        <result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo"/>
+        <result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingStation"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        AUTOID, FLIGHTNO, FLIGHTDATE, ORIGINATINGSTATION, DESTINATIONSTATION, WAYBILLNOMASTER,
+        TOTALWEIGHT, TOTALPIECE, PREPARETOTALPIECE, PREPARETOTALWEIGHT, STOWAGEDATE, "STATUS",
+        CARRIER, CUSTOMSSTATUS, PAYMODE, CUSTOMSCODE, AGENTCODE, AGENTNAME, SHIPPERNAME,
+        SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME, CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION,
+        CREATEDATE, PRODUCTNAME, SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, SHIPPER_FAX,
+        CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, CONSIGNEE_FAX, CONSIGNEE_PHONE, SHIPPER_AEO,
+        CONSIGNEE_AEO, UNLOADINGSTATION
+    </sql>
+    <select id="getPrepareMasterInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from PREPAREMASTER
+        where
+        WAYBILLNOMASTER = #{waybillNoMaster,jdbcType=VARCHAR}
+    </select>
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sunyo.wlpt.cgonms.provide.mapper.ResultExitDataMapper">
+    <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.ResultExitData">
+        <!--@mbg.generated-->
+        <!--@Table TALLYMASTER-->
+        <result column="AUTOID" jdbcType="VARCHAR" property="autoId"/>
+        <result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillNoMaster"/>
+        <result column="TCD_NAME" jdbcType="VARCHAR" property="tcdName"/>
+        <result column="TCD_TYPECODE" jdbcType="VARCHAR" property="tcdTypeCode"/>
+        <result column="TALLTYPE" jdbcType="VARCHAR" property="tallType"/>
+        <result column="FLIGHTNO" jdbcType="VARCHAR" property="flightNo"/>
+        <result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightDate"/>
+        <result column="SEGMENT" jdbcType="VARCHAR" property="segment"/>
+        <result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingStation"/>
+        <result column="O_NAME" jdbcType="VARCHAR" property="oName"/>
+        <result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationStation"/>
+        <result column="FD_NAME" jdbcType="VARCHAR" property="fdName"/>
+        <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>
+        <result column="TOTALGROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="totalGrossWeightMeasureuc"/>
+        <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>
+        <result column="TALLYTOTALPIECE" jdbcType="VARCHAR" property="tallyTotalPiece"/>
+        <result column="TALLYTOTALWEIGHT" jdbcType="VARCHAR" property="tallyTotalWeight"/>
+        <result column="GROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="grossWeightMeasureuc"/>
+        <result column="LOADSTARTTIME" jdbcType="TIMESTAMP" property="loadStartTime"/>
+        <result column="LOADENDTIME" jdbcType="TIMESTAMP" property="loadEndTime"/>
+        <result column="STATUS" jdbcType="VARCHAR" property="status"/>
+        <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>
+        <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>
+        <result column="DISCHARGEDATE" jdbcType="TIMESTAMP" property="dischargeDate"/>
+        <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>
+        <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="DEAL_FLAG" jdbcType="VARCHAR" property="dealFlag"/>
+        <result column="BILL_TALLY_FLAG" jdbcType="VARCHAR" property="billTallyFlag"/>
+        <result column="DEAL_TIME" jdbcType="TIMESTAMP" property="dealTime"/>
+        <result column="TRANSPORTSPLITDESCRIPTION" jdbcType="VARCHAR" property="transportSplitDescription"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        AUTOID, WAYBILLNOMASTER, TCD_NAME, TCD_TYPECODE, TALLTYPE, FLIGHTNO, FLIGHTDATE,
+        SEGMENT, ORIGINATINGSTATION, O_NAME, DESTINATIONSTATION, FD_NAME, TOTALWEIGHT, TOTALGROSSWEIGHTMEASUREUC,
+        TOTALPIECE, TALLYTOTALPIECE, TALLYTOTALWEIGHT, GROSSWEIGHTMEASUREUC, LOADSTARTTIME,
+        LOADENDTIME, "STATUS", CUSTOMSCODE, PRODUCTNAME, DISCHARGEDATE, RECEIPTINFORMATION,
+        CREATEDATE, DEAL_FLAG, BILL_TALLY_FLAG, DEAL_TIME, TRANSPORTSPLITDESCRIPTION
+    </sql>
+    <!-- 获取 新舱单——理货信息 中的相应数据 -->
+    <select id="getResultExitDataInfo" parameterType="com.sunyo.wlpt.cgonms.provide.domain.ResultExitData"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from TALLYMASTER
+        where 1=1
+        <!-- 航班号 -->
+        <if test="flightNo!=null and flightNo!=''">
+            AND FLIGHTNO= #{flightNo,jdbcType=VARCHAR}
+        </if>
+        <!-- 航班日期 -->
+        <if test="flightDate!=null">
+            AND FLIGHTDATE = #{flightDate,jdbcType=DATE}
+        </if>
+    </select>
+
+
+</mapper>

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sunyo.wlpt.cgonms.provide.mapper.TallymasterMapper">
-  <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.Tallymaster">
-    <!--@mbg.generated-->
-    <!--@Table TALLYMASTER-->
-    <result column="AUTOID" jdbcType="VARCHAR" property="autoid" />
-    <result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillnomaster" />
-    <result column="TCD_NAME" jdbcType="VARCHAR" property="tcdName" />
-    <result column="TCD_TYPECODE" jdbcType="VARCHAR" property="tcdTypecode" />
-    <result column="TALLTYPE" jdbcType="VARCHAR" property="talltype" />
-    <result column="FLIGHTNO" jdbcType="VARCHAR" property="flightno" />
-    <result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightdate" />
-    <result column="SEGMENT" jdbcType="VARCHAR" property="segment" />
-    <result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingstation" />
-    <result column="O_NAME" jdbcType="VARCHAR" property="oName" />
-    <result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationstation" />
-    <result column="FD_NAME" jdbcType="VARCHAR" property="fdName" />
-    <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalweight" />
-    <result column="TOTALGROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="totalgrossweightmeasureuc" />
-    <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalpiece" />
-    <result column="TALLYTOTALPIECE" jdbcType="VARCHAR" property="tallytotalpiece" />
-    <result column="TALLYTOTALWEIGHT" jdbcType="VARCHAR" property="tallytotalweight" />
-    <result column="GROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="grossweightmeasureuc" />
-    <result column="LOADSTARTTIME" jdbcType="TIMESTAMP" property="loadstarttime" />
-    <result column="LOADENDTIME" jdbcType="TIMESTAMP" property="loadendtime" />
-    <result column="STATUS" jdbcType="VARCHAR" property="status" />
-    <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customscode" />
-    <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productname" />
-    <result column="DISCHARGEDATE" jdbcType="TIMESTAMP" property="dischargedate" />
-    <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptinformation" />
-    <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />
-    <result column="DEAL_FLAG" jdbcType="VARCHAR" property="dealFlag" />
-    <result column="BILL_TALLY_FLAG" jdbcType="VARCHAR" property="billTallyFlag" />
-    <result column="DEAL_TIME" jdbcType="TIMESTAMP" property="dealTime" />
-    <result column="TRANSPORTSPLITDESCRIPTION" jdbcType="VARCHAR" property="transportsplitdescription" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    AUTOID, WAYBILLNOMASTER, TCD_NAME, TCD_TYPECODE, TALLTYPE, FLIGHTNO, FLIGHTDATE, 
-    SEGMENT, ORIGINATINGSTATION, O_NAME, DESTINATIONSTATION, FD_NAME, TOTALWEIGHT, TOTALGROSSWEIGHTMEASUREUC, 
-    TOTALPIECE, TALLYTOTALPIECE, TALLYTOTALWEIGHT, GROSSWEIGHTMEASUREUC, LOADSTARTTIME, 
-    LOADENDTIME, "STATUS", CUSTOMSCODE, PRODUCTNAME, DISCHARGEDATE, RECEIPTINFORMATION, 
-    CREATEDATE, DEAL_FLAG, BILL_TALLY_FLAG, DEAL_TIME, TRANSPORTSPLITDESCRIPTION
-  </sql>
-</mapper>
\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sunyo.wlpt.cgonms.provide.mapper.TbAirportCodeMapper">
+    <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.TbAirportCode">
+        <!--@mbg.generated-->
+        <!--@Table TB_AIRPORTCODE-->
+        <result column="CITYCODE" jdbcType="VARCHAR" property="cityCode"/>
+        <result column="CIVILCODE" jdbcType="VARCHAR" property="civilCode"/>
+        <result column="CHINESEDESCRIPTION" jdbcType="VARCHAR" property="chineseDescription"/>
+        <result column="ENGLISHDESCRIPTION" jdbcType="VARCHAR" property="englishDescription"/>
+        <result column="AREA" jdbcType="VARCHAR" property="area"/>
+        <result column="COUNTRY" jdbcType="VARCHAR" property="country"/>
+        <result column="CITY" jdbcType="VARCHAR" property="city"/>
+        <result column="TIMEZONE" jdbcType="VARCHAR" property="timeZone"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        CITYCODE, CIVILCODE, CHINESEDESCRIPTION, ENGLISHDESCRIPTION, AREA, COUNTRY, CITY,
+        TIMEZONE
+    </sql>
+    <select id="getTbAirportCodeInfo" parameterType="java.lang.String"  resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from TB_AIRPORTCODE
+        where CITYCODE = #{cityId,jdbcType=VARCHAR}
+
+    </select>
+</mapper>