正在显示
4 个修改的文件
包含
50 行增加
和
4 行删除
1 | # Created by .ignore support plugin (hsz.mobi) | 1 | # Created by .ignore support plugin (hsz.mobi) |
2 | +### Java template | ||
3 | +# Compiled class file | ||
4 | +*.class | ||
5 | + | ||
6 | +# Log file | ||
7 | +*.log | ||
8 | + | ||
9 | +# BlueJ files | ||
10 | +*.ctxt | ||
11 | + | ||
12 | +# Mobile Tools for Java (J2ME) | ||
13 | +.mtj.tmp/ | ||
14 | + | ||
15 | +# Package Files # | ||
16 | +*.jar | ||
17 | +*.war | ||
18 | +*.nar | ||
19 | +*.ear | ||
20 | +*.zip | ||
21 | +*.tar.gz | ||
22 | +*.rar | ||
23 | + | ||
24 | +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml | ||
25 | +hs_err_pid* | ||
26 | + | ||
27 | +### Maven template | ||
28 | +target/ | ||
29 | +pom.xml.tag | ||
30 | +pom.xml.releaseBackup | ||
31 | +pom.xml.versionsBackup | ||
32 | +pom.xml.next | ||
33 | +release.properties | ||
34 | +dependency-reduced-pom.xml | ||
35 | +buildNumber.properties | ||
36 | +.mvn/timing.properties | ||
37 | +.mvn/wrapper/maven-wrapper.jar | ||
38 | + |
@@ -43,5 +43,10 @@ | @@ -43,5 +43,10 @@ | ||
43 | <artifactId>lombok</artifactId> | 43 | <artifactId>lombok</artifactId> |
44 | <version>1.18.8</version> | 44 | <version>1.18.8</version> |
45 | </dependency> | 45 | </dependency> |
46 | + <dependency> | ||
47 | + <groupId>joda-time</groupId> | ||
48 | + <artifactId>joda-time</artifactId> | ||
49 | + <version>2.10.3</version> | ||
50 | + </dependency> | ||
46 | </dependencies> | 51 | </dependencies> |
47 | </project> | 52 | </project> |
@@ -30,9 +30,9 @@ public class NMMS_CUSTOM_MT520X { | @@ -30,9 +30,9 @@ public class NMMS_CUSTOM_MT520X { | ||
30 | private Integer piece; | 30 | private Integer piece; |
31 | 31 | ||
32 | private Long weight; | 32 | private Long weight; |
33 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | 33 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
34 | private Date starttime; | 34 | private Date starttime; |
35 | - | 35 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8") |
36 | private Date endtime; | 36 | private Date endtime; |
37 | 37 | ||
38 | private String customcode; | 38 | private String customcode; |
@@ -24,6 +24,9 @@ | @@ -24,6 +24,9 @@ | ||
24 | <result column="cusResStatus" property="cusresstatus" jdbcType="VARCHAR" /> | 24 | <result column="cusResStatus" property="cusresstatus" jdbcType="VARCHAR" /> |
25 | <result column="operUserName" property="operusername" jdbcType="VARCHAR" /> | 25 | <result column="operUserName" property="operusername" jdbcType="VARCHAR" /> |
26 | <result column="operSystemName" property="opersystemname" jdbcType="VARCHAR" /> | 26 | <result column="operSystemName" property="opersystemname" jdbcType="VARCHAR" /> |
27 | + <result column="operReason" jdbcType="VARCHAR" property="operreason" /> | ||
28 | + <result column="operPerson" jdbcType="VARCHAR" property="operperson" /> | ||
29 | + <result column="operTel" jdbcType="VARCHAR" property="opertel" /> | ||
27 | </resultMap> | 30 | </resultMap> |
28 | <resultMap id="ResultMapWithBLOBs" type="com.sunyo.wlpt.base.model.NMMS_CUSTOM_RESPONSE" extends="BaseResultMap" > | 31 | <resultMap id="ResultMapWithBLOBs" type="com.sunyo.wlpt.base.model.NMMS_CUSTOM_RESPONSE" extends="BaseResultMap" > |
29 | <result column="cusResText" property="cusrestext" jdbcType="LONGVARCHAR" /> | 32 | <result column="cusResText" property="cusrestext" jdbcType="LONGVARCHAR" /> |
@@ -56,7 +59,7 @@ | @@ -56,7 +59,7 @@ | ||
56 | cusSenderId, cusReciverId, cusVersion, | 59 | cusSenderId, cusReciverId, cusVersion, |
57 | cusFunctionCode, cusResRcvTime, cusResSendTime, | 60 | cusFunctionCode, cusResRcvTime, cusResSendTime, |
58 | cusResCode, cusResStatus, operUserName, | 61 | cusResCode, cusResStatus, operUserName, |
59 | - operSystemName, cusResText) | 62 | + operSystemName, cusResText,operReason,operPerson,operTel) |
60 | values (#{id,jdbcType=VARCHAR}, #{flightdate,jdbcType=DATE}, #{flightno,jdbcType=VARCHAR}, | 63 | values (#{id,jdbcType=VARCHAR}, #{flightdate,jdbcType=DATE}, #{flightno,jdbcType=VARCHAR}, |
61 | #{carrier,jdbcType=VARCHAR}, #{awbano,jdbcType=VARCHAR}, #{awbhno,jdbcType=VARCHAR}, | 64 | #{carrier,jdbcType=VARCHAR}, #{awbano,jdbcType=VARCHAR}, #{awbhno,jdbcType=VARCHAR}, |
62 | #{bustype,jdbcType=VARCHAR}, #{busdate,jdbcType=TIMESTAMP}, #{busweight,jdbcType=DECIMAL}, | 65 | #{bustype,jdbcType=VARCHAR}, #{busdate,jdbcType=TIMESTAMP}, #{busweight,jdbcType=DECIMAL}, |
@@ -64,7 +67,8 @@ | @@ -64,7 +67,8 @@ | ||
64 | #{cussenderid,jdbcType=VARCHAR}, #{cusreciverid,jdbcType=VARCHAR}, #{cusversion,jdbcType=VARCHAR}, | 67 | #{cussenderid,jdbcType=VARCHAR}, #{cusreciverid,jdbcType=VARCHAR}, #{cusversion,jdbcType=VARCHAR}, |
65 | #{cusfunctioncode,jdbcType=VARCHAR}, #{cusresrcvtime,jdbcType=TIMESTAMP}, #{cusressendtime,jdbcType=TIMESTAMP}, | 68 | #{cusfunctioncode,jdbcType=VARCHAR}, #{cusresrcvtime,jdbcType=TIMESTAMP}, #{cusressendtime,jdbcType=TIMESTAMP}, |
66 | #{cusrescode,jdbcType=VARCHAR}, #{cusresstatus,jdbcType=VARCHAR}, #{operusername,jdbcType=VARCHAR}, | 69 | #{cusrescode,jdbcType=VARCHAR}, #{cusresstatus,jdbcType=VARCHAR}, #{operusername,jdbcType=VARCHAR}, |
67 | - #{opersystemname,jdbcType=VARCHAR}, #{cusrestext,jdbcType=LONGVARCHAR}) | 70 | + #{opersystemname,jdbcType=VARCHAR}, #{cusrestext,jdbcType=LONGVARCHAR}, #{operreason,jdbcType=VARCHAR}, |
71 | + #{operperson,jdbcType=VARCHAR}, #{opertel,jdbcType=VARCHAR}) | ||
68 | </insert> | 72 | </insert> |
69 | <insert id="insertSelective" parameterType="com.sunyo.wlpt.base.model.NMMS_CUSTOM_RESPONSE" > | 73 | <insert id="insertSelective" parameterType="com.sunyo.wlpt.base.model.NMMS_CUSTOM_RESPONSE" > |
70 | insert into CUSTOM_RESPONSE | 74 | insert into CUSTOM_RESPONSE |
-
请 注册 或 登录 后发表评论