Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -548,6 +548,16 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "订单状态")
 	private String orderStatus;
+	/**
+	 * 是否询价
+	 */
+	@ApiModelProperty(value = "是否询价")
+	private String ifEnquiry;
+	/**
+	 * 是否船务
+	 */
+	@ApiModelProperty(value = "是否船务")
+	private String ifShipping;
 
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/common/entity/OrderBase.java

@@ -34,7 +34,7 @@ public class OrderBase extends BaseEntity {
 	private Long createUser;
 
 	@ApiModelProperty("创建人名称")
-	@TableField(fill = FieldFill.INSERT)
+	@TableField(exist = false,fill = FieldFill.INSERT)
 	private String createUserName;
 	@JsonSerialize(
 		using = ToStringSerializer.class
@@ -58,7 +58,7 @@ public class OrderBase extends BaseEntity {
 	@TableField(fill = FieldFill.UPDATE)
 	private Long updateUser;
 	@ApiModelProperty("更新人")
-	@TableField(fill = FieldFill.UPDATE)
+	@TableField(exist = false,fill = FieldFill.UPDATE)
 	private String updateUserName;
 	@DateTimeFormat(
 		pattern = "yyyy-MM-dd HH:mm:ss"

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -475,5 +475,15 @@ public class Order extends OrderBase {
 	 */
 	@ApiModelProperty(value = "订单状态")
 	private String orderStatus;
+	/**
+	 * 是否询价
+	 */
+	@ApiModelProperty(value = "是否询价")
+	private String ifEnquiry;
+	/**
+	 * 是否船务
+	 */
+	@ApiModelProperty(value = "是否船务")
+	private String ifShipping;
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -93,6 +93,8 @@
         <result column="credit_number" property="creditNumber"/>
         <result column="credit_amount" property="creditAmount"/>
         <result column="order_status" property="orderStatus"/>
+        <result column="if_enquiry" property="ifEnquiry"/>
+        <result column="if_shipping" property="ifShipping"/>
     </resultMap>
 
 
@@ -314,6 +316,12 @@
         <if test="Order.rmbAmount!=null">
             and rmb_amount = #{Order.rmbAmount}
         </if>
+        <if test="Order.ifEnquiry!=null and Order.ifEnquiry != ''">
+            and if_enquiry = #{Order.ifEnquiry}
+        </if>
+        <if test="Order.ifShipping!=null and Order.ifShipping != ''">
+            and if_shipping = #{Order.ifShipping}
+        </if>
         order by id
     </select>
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -93,6 +93,8 @@
         <result column="credit_number" property="creditNumber"/>
         <result column="credit_amount" property="creditAmount"/>
         <result column="order_status" property="orderStatus"/>
+        <result column="if_enquiry" property="ifEnquiry"/>
+        <result column="if_shipping" property="ifShipping"/>
     </resultMap>