1

src/main/java/com/chinaitop/depot/business/model/BusinessContractReceive.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.business.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class BusinessContractReceive {
     private Integer id;
 
@@ -40,6 +42,7 @@ public class BusinessContractReceive {
 
     private Integer lycd;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date rksj;
 
     private Integer khid;
@@ -48,8 +51,10 @@ public class BusinessContractReceive {
 
     private String tyxydm;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date inputTime;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     private String dataType;
@@ -120,7 +125,7 @@ public class BusinessContractReceive {
 
     /**
      * 合同类型
-     * @return htlx 合同类型
+     * @return htlx 合同类型(0:采购,1:销售)
      */
     public String getHtlx() {
         return htlx;
@@ -128,22 +133,22 @@ public class BusinessContractReceive {
 
     /**
      * 合同类型
-     * @param htlx 合同类型
+     * @param htlx 合同类型(0:采购,1:销售)
      */
     public void setHtlx(String htlx) {
         this.htlx = htlx == null ? null : htlx.trim();
     }
 
     /**
-     * 合同总数量
-     * @return htzsl 合同总数量
+     * 合同总数量(吨)
+     * @return htzsl 合同总数量(吨)
      */
     public BigDecimal getHtzsl() {
         return htzsl;
     }
 
     /**
-     * 合同总数量
+     * 合同总数量(吨)
      * @param htzsl 合同总数量
      */
     public void setHtzsl(BigDecimal htzsl) {
@@ -151,24 +156,24 @@ public class BusinessContractReceive {
     }
 
     /**
-     * 合同单价
-     * @return htdj 合同单价
+     * 合同单价(元/吨)
+     * @return htdj 合同单价(元/吨)
      */
     public BigDecimal getHtdj() {
         return htdj;
     }
 
     /**
-     * 合同单价
-     * @param htdj 合同单价
+     * 合同单价(元/吨)
+     * @param htdj 合同单价(元/吨)
      */
     public void setHtdj(BigDecimal htdj) {
         this.htdj = htdj;
     }
 
     /**
-     * 合同总价
-     * @return htzj 合同总价
+     * 合同总价(元)
+     * @return htzj 合同总价(元)
      */
     public BigDecimal getHtzj() {
         return htzj;
@@ -176,7 +181,7 @@ public class BusinessContractReceive {
 
     /**
      * 合同总价
-     * @param htzj 合同总价
+     * @param htzj 合同总价(元)
      */
     public void setHtzj(BigDecimal htzj) {
         this.htzj = htzj;

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractReceiveServiceImpl.java

@@ -283,6 +283,7 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 			businessContractReceiveMapper.insert(businessContractReceive);
 		} else {
 			businessContractReceive.setId(list.get(0).getId());
+			businessContractReceive.setUpdateTime(new Date());
 			businessContractReceiveMapper.updateByExample(businessContractReceive, example);
 		}
 	}