更新航班信息

@@ -18,6 +18,7 @@
     <properties>
         <druid.version>1.1.9</druid.version>
         <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
+        <lombok_sersion>1.18.6</lombok_sersion>
     </properties>
     <dependencies>
         <!--spring boot-->
@@ -50,7 +51,13 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-
+        <!--lombok-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok_sersion}</version>
+            <scope>provided</scope>
+        </dependency>
         <!--数据库-->
         <dependency>
             <groupId>com.alibaba</groupId>

+package com.tianbo.imfClient.controller;
+
+import com.tianbo.imfClient.dao.ORIGINMANIFESTMASTERMapper;
+import com.tianbo.imfClient.model.ResultJson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("/flight")
+public class FlightController {
+
+    @Autowired
+    ORIGINMANIFESTMASTERMapper originmanifestmasterMapper;
+
+    /**
+     * 修改航班日期
+     * @param currDate  修改前日期
+     * @param flightNo  航班号
+     * @param setDate   修改后日期
+     */
+    @PostMapping("/changeDate")
+    public ResultJson changeFlightDate(@RequestParam(value = "currDate",required = true) String currDate,
+                                 @RequestParam(value = "flightNo",required = true) String flightNo,
+                                 @RequestParam(value = "setDate", required = true) String setDate
+    ){
+        HashMap<String ,String> map = new HashMap();
+        map.put("currDate",currDate);
+        map.put("flightNo",flightNo);
+        map.put("setDate",setDate);
+        int i = originmanifestmasterMapper.changeFlightDate(map);
+        if (i>0)
+        {
+            return new ResultJson("200","更新成功",i);
+//            return "航班日期更新成功"+i;
+        }
+        return new ResultJson("500","更新失败或航班信息不正确",i);
+    }
+}

+package com.tianbo.imfClient.dao;
+
+import com.tianbo.imfClient.model.ORIGINMANIFESTMASTER;
+
+import java.util.HashMap;
+
+public interface ORIGINMANIFESTMASTERMapper {
+    int insert(ORIGINMANIFESTMASTER record);
+
+    int insertSelective(ORIGINMANIFESTMASTER record);
+
+    int changeFlightDate(HashMap map);
+}
\ No newline at end of file

+package com.tianbo.imfClient.model;
+
+import java.util.Date;
+
+public class ORIGINMANIFESTMASTER {
+    private String autoid;
+
+    private String waybillnomaster;
+
+    private String segment;
+
+    private String originatingstation;
+
+    private String destinationstation;
+
+    private String totalweight;
+
+    private String totalpiece;
+
+    private String manifesttotalpiece;
+
+    private String manifesttotalweight;
+
+    private String flightno;
+
+    private String productname;
+
+    private String customsstatus;
+
+    private String carrier1;
+
+    private String arrivalstation1;
+
+    private String carrier2;
+
+    private String arrivalstation2;
+
+    private String carrier3;
+
+    private String arrivalstation3;
+
+    private String paymode;
+
+    private String specialgoodscode;
+
+    private String customscode;
+
+    private String shippername;
+
+    private String shipperaddress;
+
+    private String consigneename;
+
+    private String consigneeaddress;
+
+    private String receiptinformation;
+
+    private Date createdate;
+
+    private Date flightDate;
+
+    private String status;
+
+    private String isbatch;
+
+    private String originatingstationBill;
+
+    private String destinationstationBill;
+
+    private String reportorder;
+
+    private String islast;
+
+    private String shipperCode;
+
+    private String shipperCountrycode;
+
+    private String shipperPhone;
+
+    private String shipperFax;
+
+    private String consigneeCode;
+
+    private String consigneeCountrycode;
+
+    private String consigneeFax;
+
+    private String specificConsigneename;
+
+    private String specificConsigneePhone;
+
+    private String consigneePhone;
+
+    public String getAutoid() {
+        return autoid;
+    }
+
+    public void setAutoid(String autoid) {
+        this.autoid = autoid == null ? null : autoid.trim();
+    }
+
+    public String getWaybillnomaster() {
+        return waybillnomaster;
+    }
+
+    public void setWaybillnomaster(String waybillnomaster) {
+        this.waybillnomaster = waybillnomaster == null ? null : waybillnomaster.trim();
+    }
+
+    public String getSegment() {
+        return segment;
+    }
+
+    public void setSegment(String segment) {
+        this.segment = segment == null ? null : segment.trim();
+    }
+
+    public String getOriginatingstation() {
+        return originatingstation;
+    }
+
+    public void setOriginatingstation(String originatingstation) {
+        this.originatingstation = originatingstation == null ? null : originatingstation.trim();
+    }
+
+    public String getDestinationstation() {
+        return destinationstation;
+    }
+
+    public void setDestinationstation(String destinationstation) {
+        this.destinationstation = destinationstation == null ? null : destinationstation.trim();
+    }
+
+    public String getTotalweight() {
+        return totalweight;
+    }
+
+    public void setTotalweight(String totalweight) {
+        this.totalweight = totalweight == null ? null : totalweight.trim();
+    }
+
+    public String getTotalpiece() {
+        return totalpiece;
+    }
+
+    public void setTotalpiece(String totalpiece) {
+        this.totalpiece = totalpiece == null ? null : totalpiece.trim();
+    }
+
+    public String getManifesttotalpiece() {
+        return manifesttotalpiece;
+    }
+
+    public void setManifesttotalpiece(String manifesttotalpiece) {
+        this.manifesttotalpiece = manifesttotalpiece == null ? null : manifesttotalpiece.trim();
+    }
+
+    public String getManifesttotalweight() {
+        return manifesttotalweight;
+    }
+
+    public void setManifesttotalweight(String manifesttotalweight) {
+        this.manifesttotalweight = manifesttotalweight == null ? null : manifesttotalweight.trim();
+    }
+
+    public String getFlightno() {
+        return flightno;
+    }
+
+    public void setFlightno(String flightno) {
+        this.flightno = flightno == null ? null : flightno.trim();
+    }
+
+    public String getProductname() {
+        return productname;
+    }
+
+    public void setProductname(String productname) {
+        this.productname = productname == null ? null : productname.trim();
+    }
+
+    public String getCustomsstatus() {
+        return customsstatus;
+    }
+
+    public void setCustomsstatus(String customsstatus) {
+        this.customsstatus = customsstatus == null ? null : customsstatus.trim();
+    }
+
+    public String getCarrier1() {
+        return carrier1;
+    }
+
+    public void setCarrier1(String carrier1) {
+        this.carrier1 = carrier1 == null ? null : carrier1.trim();
+    }
+
+    public String getArrivalstation1() {
+        return arrivalstation1;
+    }
+
+    public void setArrivalstation1(String arrivalstation1) {
+        this.arrivalstation1 = arrivalstation1 == null ? null : arrivalstation1.trim();
+    }
+
+    public String getCarrier2() {
+        return carrier2;
+    }
+
+    public void setCarrier2(String carrier2) {
+        this.carrier2 = carrier2 == null ? null : carrier2.trim();
+    }
+
+    public String getArrivalstation2() {
+        return arrivalstation2;
+    }
+
+    public void setArrivalstation2(String arrivalstation2) {
+        this.arrivalstation2 = arrivalstation2 == null ? null : arrivalstation2.trim();
+    }
+
+    public String getCarrier3() {
+        return carrier3;
+    }
+
+    public void setCarrier3(String carrier3) {
+        this.carrier3 = carrier3 == null ? null : carrier3.trim();
+    }
+
+    public String getArrivalstation3() {
+        return arrivalstation3;
+    }
+
+    public void setArrivalstation3(String arrivalstation3) {
+        this.arrivalstation3 = arrivalstation3 == null ? null : arrivalstation3.trim();
+    }
+
+    public String getPaymode() {
+        return paymode;
+    }
+
+    public void setPaymode(String paymode) {
+        this.paymode = paymode == null ? null : paymode.trim();
+    }
+
+    public String getSpecialgoodscode() {
+        return specialgoodscode;
+    }
+
+    public void setSpecialgoodscode(String specialgoodscode) {
+        this.specialgoodscode = specialgoodscode == null ? null : specialgoodscode.trim();
+    }
+
+    public String getCustomscode() {
+        return customscode;
+    }
+
+    public void setCustomscode(String customscode) {
+        this.customscode = customscode == null ? null : customscode.trim();
+    }
+
+    public String getShippername() {
+        return shippername;
+    }
+
+    public void setShippername(String shippername) {
+        this.shippername = shippername == null ? null : shippername.trim();
+    }
+
+    public String getShipperaddress() {
+        return shipperaddress;
+    }
+
+    public void setShipperaddress(String shipperaddress) {
+        this.shipperaddress = shipperaddress == null ? null : shipperaddress.trim();
+    }
+
+    public String getConsigneename() {
+        return consigneename;
+    }
+
+    public void setConsigneename(String consigneename) {
+        this.consigneename = consigneename == null ? null : consigneename.trim();
+    }
+
+    public String getConsigneeaddress() {
+        return consigneeaddress;
+    }
+
+    public void setConsigneeaddress(String consigneeaddress) {
+        this.consigneeaddress = consigneeaddress == null ? null : consigneeaddress.trim();
+    }
+
+    public String getReceiptinformation() {
+        return receiptinformation;
+    }
+
+    public void setReceiptinformation(String receiptinformation) {
+        this.receiptinformation = receiptinformation == null ? null : receiptinformation.trim();
+    }
+
+    public Date getCreatedate() {
+        return createdate;
+    }
+
+    public void setCreatedate(Date createdate) {
+        this.createdate = createdate;
+    }
+
+    public Date getFlightDate() {
+        return flightDate;
+    }
+
+    public void setFlightDate(Date flightDate) {
+        this.flightDate = flightDate;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getIsbatch() {
+        return isbatch;
+    }
+
+    public void setIsbatch(String isbatch) {
+        this.isbatch = isbatch == null ? null : isbatch.trim();
+    }
+
+    public String getOriginatingstationBill() {
+        return originatingstationBill;
+    }
+
+    public void setOriginatingstationBill(String originatingstationBill) {
+        this.originatingstationBill = originatingstationBill == null ? null : originatingstationBill.trim();
+    }
+
+    public String getDestinationstationBill() {
+        return destinationstationBill;
+    }
+
+    public void setDestinationstationBill(String destinationstationBill) {
+        this.destinationstationBill = destinationstationBill == null ? null : destinationstationBill.trim();
+    }
+
+    public String getReportorder() {
+        return reportorder;
+    }
+
+    public void setReportorder(String reportorder) {
+        this.reportorder = reportorder == null ? null : reportorder.trim();
+    }
+
+    public String getIslast() {
+        return islast;
+    }
+
+    public void setIslast(String islast) {
+        this.islast = islast == null ? null : islast.trim();
+    }
+
+    public String getShipperCode() {
+        return shipperCode;
+    }
+
+    public void setShipperCode(String shipperCode) {
+        this.shipperCode = shipperCode == null ? null : shipperCode.trim();
+    }
+
+    public String getShipperCountrycode() {
+        return shipperCountrycode;
+    }
+
+    public void setShipperCountrycode(String shipperCountrycode) {
+        this.shipperCountrycode = shipperCountrycode == null ? null : shipperCountrycode.trim();
+    }
+
+    public String getShipperPhone() {
+        return shipperPhone;
+    }
+
+    public void setShipperPhone(String shipperPhone) {
+        this.shipperPhone = shipperPhone == null ? null : shipperPhone.trim();
+    }
+
+    public String getShipperFax() {
+        return shipperFax;
+    }
+
+    public void setShipperFax(String shipperFax) {
+        this.shipperFax = shipperFax == null ? null : shipperFax.trim();
+    }
+
+    public String getConsigneeCode() {
+        return consigneeCode;
+    }
+
+    public void setConsigneeCode(String consigneeCode) {
+        this.consigneeCode = consigneeCode == null ? null : consigneeCode.trim();
+    }
+
+    public String getConsigneeCountrycode() {
+        return consigneeCountrycode;
+    }
+
+    public void setConsigneeCountrycode(String consigneeCountrycode) {
+        this.consigneeCountrycode = consigneeCountrycode == null ? null : consigneeCountrycode.trim();
+    }
+
+    public String getConsigneeFax() {
+        return consigneeFax;
+    }
+
+    public void setConsigneeFax(String consigneeFax) {
+        this.consigneeFax = consigneeFax == null ? null : consigneeFax.trim();
+    }
+
+    public String getSpecificConsigneename() {
+        return specificConsigneename;
+    }
+
+    public void setSpecificConsigneename(String specificConsigneename) {
+        this.specificConsigneename = specificConsigneename == null ? null : specificConsigneename.trim();
+    }
+
+    public String getSpecificConsigneePhone() {
+        return specificConsigneePhone;
+    }
+
+    public void setSpecificConsigneePhone(String specificConsigneePhone) {
+        this.specificConsigneePhone = specificConsigneePhone == null ? null : specificConsigneePhone.trim();
+    }
+
+    public String getConsigneePhone() {
+        return consigneePhone;
+    }
+
+    public void setConsigneePhone(String consigneePhone) {
+        this.consigneePhone = consigneePhone == null ? null : consigneePhone.trim();
+    }
+}
\ No newline at end of file

+package com.tianbo.imfClient.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ResultJson<T> implements Serializable{
+    private static final long serialVersionUID = 1L;
+
+    // 状态码 正确为200
+    private String code = "200";
+    // 描述
+    private String msg = "";
+
+    private String error;
+    // 返回对象
+    private T data;
+    //返回的JWT
+    private String jwtToken;
+
+    public ResultJson() {
+    }
+
+    public ResultJson(String code) {
+        this.code = code;
+    }
+
+    public ResultJson(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public ResultJson(T data) {
+        this.data = data;
+    }
+
+    public ResultJson(String code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+}

@@ -27,7 +27,7 @@ public class IMF_Task {
     private RestOperations restTemplate;
 
 
-    @Scheduled(fixedRate = 5000)
+//    @Scheduled(fixedRate = 5000)
     public  void start() throws Exception {
         PropertyConfigurator.configure("config/log4j.properties");
         client = IMFClientFactory.createInstance();

 
 #服务端口
-server.port=7003
+server.port=8001
 server.servlet.context-path=${SERVER_CONTEXTPATH:}
 
 #静态资源，设置上传文件的访问，上传文件的路径，要带斜杠
@@ -12,9 +12,9 @@ spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/stat
 #springcloud 基本配置
 
 #eureka主机名，会在控制页面中显示
-spring.cloud.features.enabled=true
-spring.cloud.discovery.enabled=true
-spring.cloud.service-registry.auto-registration.enabled=true
+spring.cloud.features.enabled=false
+spring.cloud.discovery.enabled=false
+spring.cloud.service-registry.auto-registration.enabled=false
 eureka.instance.hostname=${spring.cloud.client.ip-address}
 #eureka服务器页面中status的请求路径
 eureka.instance.status-page-url=http://${eureka.instance.hostname}:${server.port}/index
@@ -28,7 +28,7 @@ eureka.instance.lease-renewal-interval-in-seconds=15
 eureka.instance.lease-expiration-duration-in-seconds=45
 
 #服务名
-spring.application.name=fimsAgentClient
+spring.application.name=changeManifestInfomation
 
 spring.jackson.serialization.fail-on-empty-beans=false
 
@@ -45,16 +45,16 @@ spring.mvc.view.suffix=.html
 
 #spring.datasource oracle
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-#spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
-#spring.datasource.url=jdbc:oracle:thin:@10.50.3.68:1521:CGODW
-#spring.datasource.username=CGOETL
-#spring.datasource.password=1q2w3e4r
+spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
+spring.datasource.url=jdbc:oracle:thin:@218.28.199.134:8004:CGODB
+spring.datasource.username=CGONMS
+spring.datasource.password=1q2w3e4r
 
 #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
-spring.datasource.url=jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8
+#spring.datasource.username=root
+#spring.datasource.password=
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.max-idle=10
 spring.datasource.max-wait=10000
 spring.datasource.min-idle=5
@@ -71,9 +71,9 @@ spring.datasource.druid.min-evictable-idle-time-millis=300000
 #间隔多久进行一次检测，检测需要关闭的空闲连接
 spring.datasource.druid.time-between-eviction-runs-millis=60000
 #oracle
-#spring.datasource.druid.validation-query=SELECT 'x' FROM DUAL
+spring.datasource.druid.validation-query=SELECT 'x' FROM DUAL
 #mysql
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
+#spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
@@ -86,7 +86,7 @@ mybatis.type-aliases-package=com.tianbo.imfClient.model
 
 
 
-pagehelper.helper-dialect=mysql
+pagehelper.helper-dialect=oracle
 #pagehelper.auto-dialect=true
 #pagehelper.auto-runtime-dialect=true
 pagehelper.reasonable=true

@@ -4,8 +4,8 @@
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
     <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
-    <classPathEntry  location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>
-    <!--<classPathEntry  location="/Users/mrz/Documents/maven/ojdbc6.jar"/>-->
+    <!--<classPathEntry  location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>-->
+    <classPathEntry  location="/Users/mrz/Documents/maven/ojdbc6.jar"/>
     <context id="DB2Tables"  targetRuntime="MyBatis3">
         <commentGenerator>
             <property name="suppressDate" value="true"/>
@@ -13,16 +13,16 @@
             <property name="suppressAllComments" value="true"/>
         </commentGenerator>
         <!--数据库链接URL，用户名、密码 -->
-        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                            connectionURL="jdbc:mysql://127.0.0.1:3307/statistics"
-                            userId="root"
-                            password="">
-        </jdbcConnection>
-        <!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"-->
-                        <!--connectionURL="jdbc:oracle:thin:@10.50.3.68:1521:CGODW"-->
-                        <!--userId="CGOETL"-->
-                        <!--password="1q2w3e4r">-->
+        <!--<jdbcConnection driverClass="com.mysql.jdbc.Driver"-->
+                            <!--connectionURL="jdbc:mysql://127.0.0.1:3307/statistics"-->
+                            <!--userId="root"-->
+                            <!--password="">-->
         <!--</jdbcConnection>-->
+        <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"
+                        connectionURL="jdbc:oracle:thin:@218.28.199.134:8004:CGODB"
+                        userId="CGONMS"
+                        password="1q2w3e4r">
+        </jdbcConnection>
         <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
             NUMERIC 类型解析为java.math.BigDecimal -->
         <!--<javaTypeResolver>-->
@@ -45,6 +45,6 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
-        <table tableName="attachment" domainObjectName="Attachment" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
+        <table tableName="ORIGINMANIFESTMASTER" domainObjectName="ORIGINMANIFESTMASTER" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
     </context>
 </generatorConfiguration>
\ 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.tianbo.imfClient.dao.ORIGINMANIFESTMASTERMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" >
+    <result column="AUTOID" property="autoid" jdbcType="VARCHAR" />
+    <result column="WAYBILLNOMASTER" property="waybillnomaster" jdbcType="VARCHAR" />
+    <result column="SEGMENT" property="segment" jdbcType="VARCHAR" />
+    <result column="ORIGINATINGSTATION" property="originatingstation" jdbcType="VARCHAR" />
+    <result column="DESTINATIONSTATION" property="destinationstation" jdbcType="VARCHAR" />
+    <result column="TOTALWEIGHT" property="totalweight" jdbcType="VARCHAR" />
+    <result column="TOTALPIECE" property="totalpiece" jdbcType="VARCHAR" />
+    <result column="MANIFESTTOTALPIECE" property="manifesttotalpiece" jdbcType="VARCHAR" />
+    <result column="MANIFESTTOTALWEIGHT" property="manifesttotalweight" jdbcType="VARCHAR" />
+    <result column="FLIGHTNO" property="flightno" jdbcType="VARCHAR" />
+    <result column="PRODUCTNAME" property="productname" jdbcType="VARCHAR" />
+    <result column="CUSTOMSSTATUS" property="customsstatus" jdbcType="VARCHAR" />
+    <result column="CARRIER1" property="carrier1" jdbcType="VARCHAR" />
+    <result column="ARRIVALSTATION1" property="arrivalstation1" jdbcType="VARCHAR" />
+    <result column="CARRIER2" property="carrier2" jdbcType="VARCHAR" />
+    <result column="ARRIVALSTATION2" property="arrivalstation2" jdbcType="VARCHAR" />
+    <result column="CARRIER3" property="carrier3" jdbcType="VARCHAR" />
+    <result column="ARRIVALSTATION3" property="arrivalstation3" jdbcType="VARCHAR" />
+    <result column="PAYMODE" property="paymode" jdbcType="VARCHAR" />
+    <result column="SPECIALGOODSCODE" property="specialgoodscode" jdbcType="VARCHAR" />
+    <result column="CUSTOMSCODE" property="customscode" jdbcType="VARCHAR" />
+    <result column="SHIPPERNAME" property="shippername" jdbcType="VARCHAR" />
+    <result column="SHIPPERADDRESS" property="shipperaddress" jdbcType="VARCHAR" />
+    <result column="CONSIGNEENAME" property="consigneename" jdbcType="VARCHAR" />
+    <result column="CONSIGNEEADDRESS" property="consigneeaddress" jdbcType="VARCHAR" />
+    <result column="RECEIPTINFORMATION" property="receiptinformation" jdbcType="VARCHAR" />
+    <result column="CREATEDATE" property="createdate" jdbcType="TIMESTAMP" />
+    <result column="FLIGHT_DATE" property="flightDate" jdbcType="TIMESTAMP" />
+    <result column="STATUS" property="status" jdbcType="VARCHAR" />
+    <result column="ISBATCH" property="isbatch" jdbcType="VARCHAR" />
+    <result column="ORIGINATINGSTATION_BILL" property="originatingstationBill" jdbcType="VARCHAR" />
+    <result column="DESTINATIONSTATION_BILL" property="destinationstationBill" jdbcType="VARCHAR" />
+    <result column="REPORTORDER" property="reportorder" jdbcType="VARCHAR" />
+    <result column="ISLAST" property="islast" jdbcType="VARCHAR" />
+    <result column="SHIPPER_CODE" property="shipperCode" jdbcType="VARCHAR" />
+    <result column="SHIPPER_COUNTRYCODE" property="shipperCountrycode" jdbcType="VARCHAR" />
+    <result column="SHIPPER_PHONE" property="shipperPhone" jdbcType="VARCHAR" />
+    <result column="SHIPPER_FAX" property="shipperFax" jdbcType="VARCHAR" />
+    <result column="CONSIGNEE_CODE" property="consigneeCode" jdbcType="VARCHAR" />
+    <result column="CONSIGNEE_COUNTRYCODE" property="consigneeCountrycode" jdbcType="VARCHAR" />
+    <result column="CONSIGNEE_FAX" property="consigneeFax" jdbcType="VARCHAR" />
+    <result column="SPECIFIC_CONSIGNEENAME" property="specificConsigneename" jdbcType="VARCHAR" />
+    <result column="SPECIFIC_CONSIGNEE_PHONE" property="specificConsigneePhone" jdbcType="VARCHAR" />
+    <result column="CONSIGNEE_PHONE" property="consigneePhone" jdbcType="VARCHAR" />
+  </resultMap>
+  <insert id="insert" parameterType="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" >
+    insert into ORIGINMANIFESTMASTER (AUTOID, WAYBILLNOMASTER, SEGMENT, 
+      ORIGINATINGSTATION, DESTINATIONSTATION, 
+      TOTALWEIGHT, TOTALPIECE, MANIFESTTOTALPIECE, 
+      MANIFESTTOTALWEIGHT, FLIGHTNO, PRODUCTNAME, 
+      CUSTOMSSTATUS, CARRIER1, ARRIVALSTATION1, 
+      CARRIER2, ARRIVALSTATION2, CARRIER3, 
+      ARRIVALSTATION3, PAYMODE, SPECIALGOODSCODE, 
+      CUSTOMSCODE, SHIPPERNAME, SHIPPERADDRESS, 
+      CONSIGNEENAME, CONSIGNEEADDRESS, RECEIPTINFORMATION, 
+      CREATEDATE, FLIGHT_DATE, STATUS, 
+      ISBATCH, ORIGINATINGSTATION_BILL, DESTINATIONSTATION_BILL, 
+      REPORTORDER, ISLAST, SHIPPER_CODE, 
+      SHIPPER_COUNTRYCODE, SHIPPER_PHONE, SHIPPER_FAX, 
+      CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, CONSIGNEE_FAX, 
+      SPECIFIC_CONSIGNEENAME, SPECIFIC_CONSIGNEE_PHONE, 
+      CONSIGNEE_PHONE)
+    values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{segment,jdbcType=VARCHAR}, 
+      #{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, 
+      #{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{manifesttotalpiece,jdbcType=VARCHAR}, 
+      #{manifesttotalweight,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR}, 
+      #{customsstatus,jdbcType=VARCHAR}, #{carrier1,jdbcType=VARCHAR}, #{arrivalstation1,jdbcType=VARCHAR}, 
+      #{carrier2,jdbcType=VARCHAR}, #{arrivalstation2,jdbcType=VARCHAR}, #{carrier3,jdbcType=VARCHAR}, 
+      #{arrivalstation3,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{specialgoodscode,jdbcType=VARCHAR}, 
+      #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, 
+      #{consigneename,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR}, 
+      #{createdate,jdbcType=TIMESTAMP}, #{flightDate,jdbcType=TIMESTAMP}, #{status,jdbcType=VARCHAR}, 
+      #{isbatch,jdbcType=VARCHAR}, #{originatingstationBill,jdbcType=VARCHAR}, #{destinationstationBill,jdbcType=VARCHAR}, 
+      #{reportorder,jdbcType=VARCHAR}, #{islast,jdbcType=VARCHAR}, #{shipperCode,jdbcType=VARCHAR}, 
+      #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, #{shipperFax,jdbcType=VARCHAR}, 
+      #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, 
+      #{specificConsigneename,jdbcType=VARCHAR}, #{specificConsigneePhone,jdbcType=VARCHAR}, 
+      #{consigneePhone,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" >
+    insert into ORIGINMANIFESTMASTER
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="autoid != null" >
+        AUTOID,
+      </if>
+      <if test="waybillnomaster != null" >
+        WAYBILLNOMASTER,
+      </if>
+      <if test="segment != null" >
+        SEGMENT,
+      </if>
+      <if test="originatingstation != null" >
+        ORIGINATINGSTATION,
+      </if>
+      <if test="destinationstation != null" >
+        DESTINATIONSTATION,
+      </if>
+      <if test="totalweight != null" >
+        TOTALWEIGHT,
+      </if>
+      <if test="totalpiece != null" >
+        TOTALPIECE,
+      </if>
+      <if test="manifesttotalpiece != null" >
+        MANIFESTTOTALPIECE,
+      </if>
+      <if test="manifesttotalweight != null" >
+        MANIFESTTOTALWEIGHT,
+      </if>
+      <if test="flightno != null" >
+        FLIGHTNO,
+      </if>
+      <if test="productname != null" >
+        PRODUCTNAME,
+      </if>
+      <if test="customsstatus != null" >
+        CUSTOMSSTATUS,
+      </if>
+      <if test="carrier1 != null" >
+        CARRIER1,
+      </if>
+      <if test="arrivalstation1 != null" >
+        ARRIVALSTATION1,
+      </if>
+      <if test="carrier2 != null" >
+        CARRIER2,
+      </if>
+      <if test="arrivalstation2 != null" >
+        ARRIVALSTATION2,
+      </if>
+      <if test="carrier3 != null" >
+        CARRIER3,
+      </if>
+      <if test="arrivalstation3 != null" >
+        ARRIVALSTATION3,
+      </if>
+      <if test="paymode != null" >
+        PAYMODE,
+      </if>
+      <if test="specialgoodscode != null" >
+        SPECIALGOODSCODE,
+      </if>
+      <if test="customscode != null" >
+        CUSTOMSCODE,
+      </if>
+      <if test="shippername != null" >
+        SHIPPERNAME,
+      </if>
+      <if test="shipperaddress != null" >
+        SHIPPERADDRESS,
+      </if>
+      <if test="consigneename != null" >
+        CONSIGNEENAME,
+      </if>
+      <if test="consigneeaddress != null" >
+        CONSIGNEEADDRESS,
+      </if>
+      <if test="receiptinformation != null" >
+        RECEIPTINFORMATION,
+      </if>
+      <if test="createdate != null" >
+        CREATEDATE,
+      </if>
+      <if test="flightDate != null" >
+        FLIGHT_DATE,
+      </if>
+      <if test="status != null" >
+        STATUS,
+      </if>
+      <if test="isbatch != null" >
+        ISBATCH,
+      </if>
+      <if test="originatingstationBill != null" >
+        ORIGINATINGSTATION_BILL,
+      </if>
+      <if test="destinationstationBill != null" >
+        DESTINATIONSTATION_BILL,
+      </if>
+      <if test="reportorder != null" >
+        REPORTORDER,
+      </if>
+      <if test="islast != null" >
+        ISLAST,
+      </if>
+      <if test="shipperCode != null" >
+        SHIPPER_CODE,
+      </if>
+      <if test="shipperCountrycode != null" >
+        SHIPPER_COUNTRYCODE,
+      </if>
+      <if test="shipperPhone != null" >
+        SHIPPER_PHONE,
+      </if>
+      <if test="shipperFax != null" >
+        SHIPPER_FAX,
+      </if>
+      <if test="consigneeCode != null" >
+        CONSIGNEE_CODE,
+      </if>
+      <if test="consigneeCountrycode != null" >
+        CONSIGNEE_COUNTRYCODE,
+      </if>
+      <if test="consigneeFax != null" >
+        CONSIGNEE_FAX,
+      </if>
+      <if test="specificConsigneename != null" >
+        SPECIFIC_CONSIGNEENAME,
+      </if>
+      <if test="specificConsigneePhone != null" >
+        SPECIFIC_CONSIGNEE_PHONE,
+      </if>
+      <if test="consigneePhone != null" >
+        CONSIGNEE_PHONE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="autoid != null" >
+        #{autoid,jdbcType=VARCHAR},
+      </if>
+      <if test="waybillnomaster != null" >
+        #{waybillnomaster,jdbcType=VARCHAR},
+      </if>
+      <if test="segment != null" >
+        #{segment,jdbcType=VARCHAR},
+      </if>
+      <if test="originatingstation != null" >
+        #{originatingstation,jdbcType=VARCHAR},
+      </if>
+      <if test="destinationstation != null" >
+        #{destinationstation,jdbcType=VARCHAR},
+      </if>
+      <if test="totalweight != null" >
+        #{totalweight,jdbcType=VARCHAR},
+      </if>
+      <if test="totalpiece != null" >
+        #{totalpiece,jdbcType=VARCHAR},
+      </if>
+      <if test="manifesttotalpiece != null" >
+        #{manifesttotalpiece,jdbcType=VARCHAR},
+      </if>
+      <if test="manifesttotalweight != null" >
+        #{manifesttotalweight,jdbcType=VARCHAR},
+      </if>
+      <if test="flightno != null" >
+        #{flightno,jdbcType=VARCHAR},
+      </if>
+      <if test="productname != null" >
+        #{productname,jdbcType=VARCHAR},
+      </if>
+      <if test="customsstatus != null" >
+        #{customsstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="carrier1 != null" >
+        #{carrier1,jdbcType=VARCHAR},
+      </if>
+      <if test="arrivalstation1 != null" >
+        #{arrivalstation1,jdbcType=VARCHAR},
+      </if>
+      <if test="carrier2 != null" >
+        #{carrier2,jdbcType=VARCHAR},
+      </if>
+      <if test="arrivalstation2 != null" >
+        #{arrivalstation2,jdbcType=VARCHAR},
+      </if>
+      <if test="carrier3 != null" >
+        #{carrier3,jdbcType=VARCHAR},
+      </if>
+      <if test="arrivalstation3 != null" >
+        #{arrivalstation3,jdbcType=VARCHAR},
+      </if>
+      <if test="paymode != null" >
+        #{paymode,jdbcType=VARCHAR},
+      </if>
+      <if test="specialgoodscode != null" >
+        #{specialgoodscode,jdbcType=VARCHAR},
+      </if>
+      <if test="customscode != null" >
+        #{customscode,jdbcType=VARCHAR},
+      </if>
+      <if test="shippername != null" >
+        #{shippername,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperaddress != null" >
+        #{shipperaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneename != null" >
+        #{consigneename,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeaddress != null" >
+        #{consigneeaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="receiptinformation != null" >
+        #{receiptinformation,jdbcType=VARCHAR},
+      </if>
+      <if test="createdate != null" >
+        #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="flightDate != null" >
+        #{flightDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="isbatch != null" >
+        #{isbatch,jdbcType=VARCHAR},
+      </if>
+      <if test="originatingstationBill != null" >
+        #{originatingstationBill,jdbcType=VARCHAR},
+      </if>
+      <if test="destinationstationBill != null" >
+        #{destinationstationBill,jdbcType=VARCHAR},
+      </if>
+      <if test="reportorder != null" >
+        #{reportorder,jdbcType=VARCHAR},
+      </if>
+      <if test="islast != null" >
+        #{islast,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperCode != null" >
+        #{shipperCode,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperCountrycode != null" >
+        #{shipperCountrycode,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperPhone != null" >
+        #{shipperPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="shipperFax != null" >
+        #{shipperFax,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeCode != null" >
+        #{consigneeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeCountrycode != null" >
+        #{consigneeCountrycode,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeFax != null" >
+        #{consigneeFax,jdbcType=VARCHAR},
+      </if>
+      <if test="specificConsigneename != null" >
+        #{specificConsigneename,jdbcType=VARCHAR},
+      </if>
+      <if test="specificConsigneePhone != null" >
+        #{specificConsigneePhone,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneePhone != null" >
+        #{consigneePhone,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="changeFlightDate" parameterType="hashmap">
+      UPDATE ORIGINMANIFESTMASTER
+      set FLIGHT_DATE = "TO_DATE"(#{setDate},'yyyy-mm-dd')
+      WHERE
+        FLIGHT_DATE = "TO_DATE"(#{currDate},'yyyy-mm-dd')
+      AND FLIGHTNO=#{flightNo}
+  </update>
+</mapper>
\ No newline at end of file