一级市场大订单新增订单边民确认

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrders.java

@@ -113,16 +113,36 @@ public class TbCollageOrders extends Model<TbCollageOrders> implements Serializa
 	private String entryFailReason;
 
 	/**
+	 * 订单边民确认
+	 */
+	private String peopleConfirmStatus;
+
+	/**
+	 * 订单边民确认时间
+	 */
+	private Date peopleConfirmTime;
+
+	/**
 	 * 进口边民确认
 	 */
 	private String importPeopleStatus;
 
 	/**
+	 * 进口边民确认时间
+	 */
+	private Date importPeopleTime;
+
+	/**
 	 * 进口组长确认
 	 */
 	private String importLeaderStatus;
 
 	/**
+	 * 进口组长确认时间
+	 */
+	private Date importLeaderTime;
+
+	/**
 	 * 进口申报单号
 	 */
 	private String importNo;

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersMapper.xml

@@ -57,6 +57,7 @@
 			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
 			<if test=' this.has("updateTime") '> and update_time = #{updateTime} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("peopleConfirmStatus") '> and people_confirm_status = #{peopleConfirmStatus} </if>
 		</where>
 		order by
 		<choose>