订单查询

src/main/java/com/minpay/db/table/mapper/VmDeliveryInfMapper.java

@@ -0,0 +1,97 @@
+package com.minpay.db.table.mapper;
+
+import com.minpay.db.table.model.VmDeliveryInf;
+import com.minpay.db.table.model.VmDeliveryInfExample;
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface VmDeliveryInfMapper extends IMINMybatisEntityMapper<VmDeliveryInf, String, VmDeliveryInfExample> {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int countByExample(VmDeliveryInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int deleteByExample(VmDeliveryInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int deleteByPrimaryKey(String deliveryId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int insert(VmDeliveryInf record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int insertSelective(VmDeliveryInf record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    List<VmDeliveryInf> selectByExample(VmDeliveryInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    VmDeliveryInf selectByPrimaryKey(String deliveryId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int updateByExampleSelective(@Param("record") VmDeliveryInf record, @Param("example") VmDeliveryInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int updateByExample(@Param("record") VmDeliveryInf record, @Param("example") VmDeliveryInfExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKeySelective(VmDeliveryInf record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table vm_delivery_inf
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKey(VmDeliveryInf record);
+}

src/main/java/com/minpay/db/table/model/VmDeliveryInf.java

@@ -0,0 +1,645 @@
+package com.minpay.db.table.model;
+
+import com.startup.minpay.frame.data.AbstractMINBean;
+
+public class VmDeliveryInf extends AbstractMINBean {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    private String deliveryId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_CHANNEL
+     *
+     * @mbggenerated
+     */
+    private String channel;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_EQUIPMENT_ID
+     *
+     * @mbggenerated
+     */
+    private String equipmentId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_PERSON_ID
+     *
+     * @mbggenerated
+     */
+    private String personId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_ORD_DET_ID
+     *
+     * @mbggenerated
+     */
+    private String ordDetId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_PRO_TYPE
+     *
+     * @mbggenerated
+     */
+    private String proType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_PRO_NAME
+     *
+     * @mbggenerated
+     */
+    private String proName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_PRO_PRICE
+     *
+     * @mbggenerated
+     */
+    private String proPrice;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_PRO_NUMS
+     *
+     * @mbggenerated
+     */
+    private String proNums;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_AMOUNT
+     *
+     * @mbggenerated
+     */
+    private String amount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_STATUS
+     *
+     * @mbggenerated
+     */
+    private String status;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_CARGO_WAY
+     *
+     * @mbggenerated
+     */
+    private String cargoWay;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_DELIVERY_NUMS
+     *
+     * @mbggenerated
+     */
+    private String deliveryNums;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_REMARKS
+     *
+     * @mbggenerated
+     */
+    private String remarks;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_CREATE_USER
+     *
+     * @mbggenerated
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_CREATE_TIME
+     *
+     * @mbggenerated
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_MODIFY_USER
+     *
+     * @mbggenerated
+     */
+    private String modifyUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_MODIFY_TIME
+     *
+     * @mbggenerated
+     */
+    private String modifyTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    private String branchid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @mbggenerated
+     */
+    private String proEquRelId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_DELIVERY_ID
+     *
+     * @return the value of vm_delivery_inf.VDI_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    public String getDeliveryId() {
+        return deliveryId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_DELIVERY_ID
+     *
+     * @param deliveryId the value for vm_delivery_inf.VDI_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    public void setDeliveryId(String deliveryId) {
+        this.deliveryId = deliveryId == null ? null : deliveryId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_CHANNEL
+     *
+     * @return the value of vm_delivery_inf.VDI_CHANNEL
+     *
+     * @mbggenerated
+     */
+    public String getChannel() {
+        return channel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_CHANNEL
+     *
+     * @param channel the value for vm_delivery_inf.VDI_CHANNEL
+     *
+     * @mbggenerated
+     */
+    public void setChannel(String channel) {
+        this.channel = channel == null ? null : channel.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_EQUIPMENT_ID
+     *
+     * @return the value of vm_delivery_inf.VDI_EQUIPMENT_ID
+     *
+     * @mbggenerated
+     */
+    public String getEquipmentId() {
+        return equipmentId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_EQUIPMENT_ID
+     *
+     * @param equipmentId the value for vm_delivery_inf.VDI_EQUIPMENT_ID
+     *
+     * @mbggenerated
+     */
+    public void setEquipmentId(String equipmentId) {
+        this.equipmentId = equipmentId == null ? null : equipmentId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_PERSON_ID
+     *
+     * @return the value of vm_delivery_inf.VDI_PERSON_ID
+     *
+     * @mbggenerated
+     */
+    public String getPersonId() {
+        return personId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_PERSON_ID
+     *
+     * @param personId the value for vm_delivery_inf.VDI_PERSON_ID
+     *
+     * @mbggenerated
+     */
+    public void setPersonId(String personId) {
+        this.personId = personId == null ? null : personId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_ORD_DET_ID
+     *
+     * @return the value of vm_delivery_inf.VDI_ORD_DET_ID
+     *
+     * @mbggenerated
+     */
+    public String getOrdDetId() {
+        return ordDetId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_ORD_DET_ID
+     *
+     * @param ordDetId the value for vm_delivery_inf.VDI_ORD_DET_ID
+     *
+     * @mbggenerated
+     */
+    public void setOrdDetId(String ordDetId) {
+        this.ordDetId = ordDetId == null ? null : ordDetId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_PRO_TYPE
+     *
+     * @return the value of vm_delivery_inf.VDI_PRO_TYPE
+     *
+     * @mbggenerated
+     */
+    public String getProType() {
+        return proType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_PRO_TYPE
+     *
+     * @param proType the value for vm_delivery_inf.VDI_PRO_TYPE
+     *
+     * @mbggenerated
+     */
+    public void setProType(String proType) {
+        this.proType = proType == null ? null : proType.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_PRO_NAME
+     *
+     * @return the value of vm_delivery_inf.VDI_PRO_NAME
+     *
+     * @mbggenerated
+     */
+    public String getProName() {
+        return proName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_PRO_NAME
+     *
+     * @param proName the value for vm_delivery_inf.VDI_PRO_NAME
+     *
+     * @mbggenerated
+     */
+    public void setProName(String proName) {
+        this.proName = proName == null ? null : proName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_PRO_PRICE
+     *
+     * @return the value of vm_delivery_inf.VDI_PRO_PRICE
+     *
+     * @mbggenerated
+     */
+    public String getProPrice() {
+        return proPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_PRO_PRICE
+     *
+     * @param proPrice the value for vm_delivery_inf.VDI_PRO_PRICE
+     *
+     * @mbggenerated
+     */
+    public void setProPrice(String proPrice) {
+        this.proPrice = proPrice == null ? null : proPrice.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_PRO_NUMS
+     *
+     * @return the value of vm_delivery_inf.VDI_PRO_NUMS
+     *
+     * @mbggenerated
+     */
+    public String getProNums() {
+        return proNums;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_PRO_NUMS
+     *
+     * @param proNums the value for vm_delivery_inf.VDI_PRO_NUMS
+     *
+     * @mbggenerated
+     */
+    public void setProNums(String proNums) {
+        this.proNums = proNums == null ? null : proNums.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_AMOUNT
+     *
+     * @return the value of vm_delivery_inf.VDI_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public String getAmount() {
+        return amount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_AMOUNT
+     *
+     * @param amount the value for vm_delivery_inf.VDI_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public void setAmount(String amount) {
+        this.amount = amount == null ? null : amount.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_STATUS
+     *
+     * @return the value of vm_delivery_inf.VDI_STATUS
+     *
+     * @mbggenerated
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_STATUS
+     *
+     * @param status the value for vm_delivery_inf.VDI_STATUS
+     *
+     * @mbggenerated
+     */
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_CARGO_WAY
+     *
+     * @return the value of vm_delivery_inf.VDI_CARGO_WAY
+     *
+     * @mbggenerated
+     */
+    public String getCargoWay() {
+        return cargoWay;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_CARGO_WAY
+     *
+     * @param cargoWay the value for vm_delivery_inf.VDI_CARGO_WAY
+     *
+     * @mbggenerated
+     */
+    public void setCargoWay(String cargoWay) {
+        this.cargoWay = cargoWay == null ? null : cargoWay.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_DELIVERY_NUMS
+     *
+     * @return the value of vm_delivery_inf.VDI_DELIVERY_NUMS
+     *
+     * @mbggenerated
+     */
+    public String getDeliveryNums() {
+        return deliveryNums;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_DELIVERY_NUMS
+     *
+     * @param deliveryNums the value for vm_delivery_inf.VDI_DELIVERY_NUMS
+     *
+     * @mbggenerated
+     */
+    public void setDeliveryNums(String deliveryNums) {
+        this.deliveryNums = deliveryNums == null ? null : deliveryNums.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_REMARKS
+     *
+     * @return the value of vm_delivery_inf.VDI_REMARKS
+     *
+     * @mbggenerated
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_REMARKS
+     *
+     * @param remarks the value for vm_delivery_inf.VDI_REMARKS
+     *
+     * @mbggenerated
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks == null ? null : remarks.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_CREATE_USER
+     *
+     * @return the value of vm_delivery_inf.VDI_CREATE_USER
+     *
+     * @mbggenerated
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_CREATE_USER
+     *
+     * @param createUser the value for vm_delivery_inf.VDI_CREATE_USER
+     *
+     * @mbggenerated
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_CREATE_TIME
+     *
+     * @return the value of vm_delivery_inf.VDI_CREATE_TIME
+     *
+     * @mbggenerated
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_CREATE_TIME
+     *
+     * @param createTime the value for vm_delivery_inf.VDI_CREATE_TIME
+     *
+     * @mbggenerated
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_MODIFY_USER
+     *
+     * @return the value of vm_delivery_inf.VDI_MODIFY_USER
+     *
+     * @mbggenerated
+     */
+    public String getModifyUser() {
+        return modifyUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_MODIFY_USER
+     *
+     * @param modifyUser the value for vm_delivery_inf.VDI_MODIFY_USER
+     *
+     * @mbggenerated
+     */
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser == null ? null : modifyUser.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_MODIFY_TIME
+     *
+     * @return the value of vm_delivery_inf.VDI_MODIFY_TIME
+     *
+     * @mbggenerated
+     */
+    public String getModifyTime() {
+        return modifyTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_MODIFY_TIME
+     *
+     * @param modifyTime the value for vm_delivery_inf.VDI_MODIFY_TIME
+     *
+     * @mbggenerated
+     */
+    public void setModifyTime(String modifyTime) {
+        this.modifyTime = modifyTime == null ? null : modifyTime.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @return the value of vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    public String getBranchid() {
+        return branchid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @param branchid the value for vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    public void setBranchid(String branchid) {
+        this.branchid = branchid == null ? null : branchid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @return the value of vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @mbggenerated
+     */
+    public String getProEquRelId() {
+        return proEquRelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @param proEquRelId the value for vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @mbggenerated
+     */
+    public void setProEquRelId(String proEquRelId) {
+        this.proEquRelId = proEquRelId == null ? null : proEquRelId.trim();
+    }
+}

src/main/resources/com/minpay/db/table/mapper/VmDeliveryInfMapper.xml

@@ -0,0 +1,509 @@
+<?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.minpay.db.table.mapper.VmDeliveryInfMapper">
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.VmDeliveryInf">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="VDI_DELIVERY_ID" jdbcType="VARCHAR" property="deliveryId" />
+    <result column="VDI_CHANNEL" jdbcType="VARCHAR" property="channel" />
+    <result column="VDI_EQUIPMENT_ID" jdbcType="VARCHAR" property="equipmentId" />
+    <result column="VDI_PERSON_ID" jdbcType="VARCHAR" property="personId" />
+    <result column="VDI_ORD_DET_ID" jdbcType="VARCHAR" property="ordDetId" />
+    <result column="VDI_PRO_TYPE" jdbcType="VARCHAR" property="proType" />
+    <result column="VDI_PRO_NAME" jdbcType="VARCHAR" property="proName" />
+    <result column="VDI_PRO_PRICE" jdbcType="VARCHAR" property="proPrice" />
+    <result column="VDI_PRO_NUMS" jdbcType="VARCHAR" property="proNums" />
+    <result column="VDI_AMOUNT" jdbcType="VARCHAR" property="amount" />
+    <result column="VDI_STATUS" jdbcType="VARCHAR" property="status" />
+    <result column="VDI_CARGO_WAY" jdbcType="VARCHAR" property="cargoWay" />
+    <result column="VDI_DELIVERY_NUMS" jdbcType="VARCHAR" property="deliveryNums" />
+    <result column="VDI_REMARKS" jdbcType="VARCHAR" property="remarks" />
+    <result column="VDI_CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+    <result column="VDI_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
+    <result column="VDI_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
+    <result column="VDI_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
+    <result column="VDI_BRANCHID" jdbcType="VARCHAR" property="branchid" />
+    <result column="VDI_PRO_EQU_REL_ID" jdbcType="VARCHAR" property="proEquRelId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    VDI_DELIVERY_ID, VDI_CHANNEL, VDI_EQUIPMENT_ID, VDI_PERSON_ID, VDI_ORD_DET_ID, VDI_PRO_TYPE, 
+    VDI_PRO_NAME, VDI_PRO_PRICE, VDI_PRO_NUMS, VDI_AMOUNT, VDI_STATUS, VDI_CARGO_WAY, 
+    VDI_DELIVERY_NUMS, VDI_REMARKS, VDI_CREATE_USER, VDI_CREATE_TIME, VDI_MODIFY_USER, 
+    VDI_MODIFY_TIME, VDI_BRANCHID, VDI_PRO_EQU_REL_ID
+  </sql>
+  <select id="selectByExample" parameterType="com.minpay.db.table.model.VmDeliveryInfExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from vm_delivery_inf
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from vm_delivery_inf
+    where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from vm_delivery_inf
+    where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.VmDeliveryInfExample">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from vm_delivery_inf
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.minpay.db.table.model.VmDeliveryInf">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into vm_delivery_inf (VDI_DELIVERY_ID, VDI_CHANNEL, VDI_EQUIPMENT_ID, 
+      VDI_PERSON_ID, VDI_ORD_DET_ID, VDI_PRO_TYPE, 
+      VDI_PRO_NAME, VDI_PRO_PRICE, VDI_PRO_NUMS, 
+      VDI_AMOUNT, VDI_STATUS, VDI_CARGO_WAY, 
+      VDI_DELIVERY_NUMS, VDI_REMARKS, VDI_CREATE_USER, 
+      VDI_CREATE_TIME, VDI_MODIFY_USER, VDI_MODIFY_TIME, 
+      VDI_BRANCHID, VDI_PRO_EQU_REL_ID)
+    values (#{deliveryId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{equipmentId,jdbcType=VARCHAR}, 
+      #{personId,jdbcType=VARCHAR}, #{ordDetId,jdbcType=VARCHAR}, #{proType,jdbcType=VARCHAR}, 
+      #{proName,jdbcType=VARCHAR}, #{proPrice,jdbcType=VARCHAR}, #{proNums,jdbcType=VARCHAR}, 
+      #{amount,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{cargoWay,jdbcType=VARCHAR}, 
+      #{deliveryNums,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
+      #{branchid,jdbcType=VARCHAR}, #{proEquRelId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmDeliveryInf">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into vm_delivery_inf
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="deliveryId != null">
+        VDI_DELIVERY_ID,
+      </if>
+      <if test="channel != null">
+        VDI_CHANNEL,
+      </if>
+      <if test="equipmentId != null">
+        VDI_EQUIPMENT_ID,
+      </if>
+      <if test="personId != null">
+        VDI_PERSON_ID,
+      </if>
+      <if test="ordDetId != null">
+        VDI_ORD_DET_ID,
+      </if>
+      <if test="proType != null">
+        VDI_PRO_TYPE,
+      </if>
+      <if test="proName != null">
+        VDI_PRO_NAME,
+      </if>
+      <if test="proPrice != null">
+        VDI_PRO_PRICE,
+      </if>
+      <if test="proNums != null">
+        VDI_PRO_NUMS,
+      </if>
+      <if test="amount != null">
+        VDI_AMOUNT,
+      </if>
+      <if test="status != null">
+        VDI_STATUS,
+      </if>
+      <if test="cargoWay != null">
+        VDI_CARGO_WAY,
+      </if>
+      <if test="deliveryNums != null">
+        VDI_DELIVERY_NUMS,
+      </if>
+      <if test="remarks != null">
+        VDI_REMARKS,
+      </if>
+      <if test="createUser != null">
+        VDI_CREATE_USER,
+      </if>
+      <if test="createTime != null">
+        VDI_CREATE_TIME,
+      </if>
+      <if test="modifyUser != null">
+        VDI_MODIFY_USER,
+      </if>
+      <if test="modifyTime != null">
+        VDI_MODIFY_TIME,
+      </if>
+      <if test="branchid != null">
+        VDI_BRANCHID,
+      </if>
+      <if test="proEquRelId != null">
+        VDI_PRO_EQU_REL_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="deliveryId != null">
+        #{deliveryId,jdbcType=VARCHAR},
+      </if>
+      <if test="channel != null">
+        #{channel,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentId != null">
+        #{equipmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="personId != null">
+        #{personId,jdbcType=VARCHAR},
+      </if>
+      <if test="ordDetId != null">
+        #{ordDetId,jdbcType=VARCHAR},
+      </if>
+      <if test="proType != null">
+        #{proType,jdbcType=VARCHAR},
+      </if>
+      <if test="proName != null">
+        #{proName,jdbcType=VARCHAR},
+      </if>
+      <if test="proPrice != null">
+        #{proPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="proNums != null">
+        #{proNums,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null">
+        #{amount,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="cargoWay != null">
+        #{cargoWay,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryNums != null">
+        #{deliveryNums,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyUser != null">
+        #{modifyUser,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyTime != null">
+        #{modifyTime,jdbcType=VARCHAR},
+      </if>
+      <if test="branchid != null">
+        #{branchid,jdbcType=VARCHAR},
+      </if>
+      <if test="proEquRelId != null">
+        #{proEquRelId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.minpay.db.table.model.VmDeliveryInfExample" resultType="java.lang.Integer">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from vm_delivery_inf
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update vm_delivery_inf
+    <set>
+      <if test="record.deliveryId != null">
+        VDI_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channel != null">
+        VDI_CHANNEL = #{record.channel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.equipmentId != null">
+        VDI_EQUIPMENT_ID = #{record.equipmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.personId != null">
+        VDI_PERSON_ID = #{record.personId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ordDetId != null">
+        VDI_ORD_DET_ID = #{record.ordDetId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.proType != null">
+        VDI_PRO_TYPE = #{record.proType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.proName != null">
+        VDI_PRO_NAME = #{record.proName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.proPrice != null">
+        VDI_PRO_PRICE = #{record.proPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.proNums != null">
+        VDI_PRO_NUMS = #{record.proNums,jdbcType=VARCHAR},
+      </if>
+      <if test="record.amount != null">
+        VDI_AMOUNT = #{record.amount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        VDI_STATUS = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cargoWay != null">
+        VDI_CARGO_WAY = #{record.cargoWay,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deliveryNums != null">
+        VDI_DELIVERY_NUMS = #{record.deliveryNums,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null">
+        VDI_REMARKS = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null">
+        VDI_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        VDI_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modifyUser != null">
+        VDI_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modifyTime != null">
+        VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchid != null">
+        VDI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.proEquRelId != null">
+        VDI_PRO_EQU_REL_ID = #{record.proEquRelId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update vm_delivery_inf
+    set VDI_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
+      VDI_CHANNEL = #{record.channel,jdbcType=VARCHAR},
+      VDI_EQUIPMENT_ID = #{record.equipmentId,jdbcType=VARCHAR},
+      VDI_PERSON_ID = #{record.personId,jdbcType=VARCHAR},
+      VDI_ORD_DET_ID = #{record.ordDetId,jdbcType=VARCHAR},
+      VDI_PRO_TYPE = #{record.proType,jdbcType=VARCHAR},
+      VDI_PRO_NAME = #{record.proName,jdbcType=VARCHAR},
+      VDI_PRO_PRICE = #{record.proPrice,jdbcType=VARCHAR},
+      VDI_PRO_NUMS = #{record.proNums,jdbcType=VARCHAR},
+      VDI_AMOUNT = #{record.amount,jdbcType=VARCHAR},
+      VDI_STATUS = #{record.status,jdbcType=VARCHAR},
+      VDI_CARGO_WAY = #{record.cargoWay,jdbcType=VARCHAR},
+      VDI_DELIVERY_NUMS = #{record.deliveryNums,jdbcType=VARCHAR},
+      VDI_REMARKS = #{record.remarks,jdbcType=VARCHAR},
+      VDI_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      VDI_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      VDI_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
+      VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      VDI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
+      VDI_PRO_EQU_REL_ID = #{record.proEquRelId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.VmDeliveryInf">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update vm_delivery_inf
+    <set>
+      <if test="channel != null">
+        VDI_CHANNEL = #{channel,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentId != null">
+        VDI_EQUIPMENT_ID = #{equipmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="personId != null">
+        VDI_PERSON_ID = #{personId,jdbcType=VARCHAR},
+      </if>
+      <if test="ordDetId != null">
+        VDI_ORD_DET_ID = #{ordDetId,jdbcType=VARCHAR},
+      </if>
+      <if test="proType != null">
+        VDI_PRO_TYPE = #{proType,jdbcType=VARCHAR},
+      </if>
+      <if test="proName != null">
+        VDI_PRO_NAME = #{proName,jdbcType=VARCHAR},
+      </if>
+      <if test="proPrice != null">
+        VDI_PRO_PRICE = #{proPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="proNums != null">
+        VDI_PRO_NUMS = #{proNums,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null">
+        VDI_AMOUNT = #{amount,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        VDI_STATUS = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="cargoWay != null">
+        VDI_CARGO_WAY = #{cargoWay,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryNums != null">
+        VDI_DELIVERY_NUMS = #{deliveryNums,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        VDI_REMARKS = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        VDI_CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        VDI_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyUser != null">
+        VDI_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyTime != null">
+        VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      </if>
+      <if test="branchid != null">
+        VDI_BRANCHID = #{branchid,jdbcType=VARCHAR},
+      </if>
+      <if test="proEquRelId != null">
+        VDI_PRO_EQU_REL_ID = #{proEquRelId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.VmDeliveryInf">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update vm_delivery_inf
+    set VDI_CHANNEL = #{channel,jdbcType=VARCHAR},
+      VDI_EQUIPMENT_ID = #{equipmentId,jdbcType=VARCHAR},
+      VDI_PERSON_ID = #{personId,jdbcType=VARCHAR},
+      VDI_ORD_DET_ID = #{ordDetId,jdbcType=VARCHAR},
+      VDI_PRO_TYPE = #{proType,jdbcType=VARCHAR},
+      VDI_PRO_NAME = #{proName,jdbcType=VARCHAR},
+      VDI_PRO_PRICE = #{proPrice,jdbcType=VARCHAR},
+      VDI_PRO_NUMS = #{proNums,jdbcType=VARCHAR},
+      VDI_AMOUNT = #{amount,jdbcType=VARCHAR},
+      VDI_STATUS = #{status,jdbcType=VARCHAR},
+      VDI_CARGO_WAY = #{cargoWay,jdbcType=VARCHAR},
+      VDI_DELIVERY_NUMS = #{deliveryNums,jdbcType=VARCHAR},
+      VDI_REMARKS = #{remarks,jdbcType=VARCHAR},
+      VDI_CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      VDI_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      VDI_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
+      VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      VDI_BRANCHID = #{branchid,jdbcType=VARCHAR},
+      VDI_PRO_EQU_REL_ID = #{proEquRelId,jdbcType=VARCHAR}
+    where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/webapp/admin/orderManage/orderManage2.html

@@ -0,0 +1,345 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>订单管理</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+</head>
+
+<body class="content">
+<div class="order-body">
+	<div class="order-tiaojian back-gray">
+		<div class="tiaojian-part1" id = "conditions">
+			<div class="fl f12-gray4-op">所选条件：</div>
+		</div>
+		<div class="tiaojian-part2 fr demoTable">
+			<button class="layui-btn order-bnt1"  data-type="reload" >搜索</button>
+			<button class="layui-btn  order-bnt2" data-type="reset">重置</button>
+			<a href="#" id="toggle" class="top">收起</a>
+		</div>
+	</div>
+	<form class="layui-form"  action="javascript:void(0)"  id = "orderForm">
+		<div class="order-select back-border" id="content">
+
+			<div class="layui-inline">
+				<label class="f12-gray4">订单编号：</label>
+				<input onchange = "changeSelectCon(0,this,'inp')" class="search-select" type="tel" name="orderNo"  id ="orderNo" lay-verify="orderNo"  autocomplete="off" placeholder="请输入订单编号" class="y-left-input">
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">创建时间：</label>
+				<input  class="search-select" type="text"  id="dates" placeholder="日期（区间）"   readonly />
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">状态：</label>
+				<div  class=""  style="display:inline-block" id = 'state'></div>
+			</div>
+
+			<div class="layui-inline">
+				<label class="f12-gray4">机台号：</label>
+				<input onchange = "changeSelectCon(3,this,'inp')"   class="search-select" type="tel" name="equipmentId"  id ="equipmentId" lay-verify="equipmentId"  autocomplete="off" placeholder="请输入机器号" class="layui-input">
+			</div>
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">机器名称：</label>
+				<input onchange = "changeSelectCon(4,this,'inp')"   class="search-select" type="tel" name="equipmentName"  id ="equipmentName" lay-verify="equipmentName"  autocomplete="off" placeholder="请输入机器名称" class="layui-input">
+			</div>
+			<!--<div class="layui-inline">
+				<label class="f12-gray4">货道号：</label>
+				<input onchange = "changeSelectCon(5,this,'inp')"   class="search-select" type="tel" name="freightwayId"  id ="freightwayId" lay-verify="freightwayId"  autocomplete="off" placeholder="请输入货道号" class="layui-input">
+			</div>-->
+			<div class="layui-inline">
+				<label class="f12-gray4">支付方式：</label>
+				<div  class=""  style="display:inline-block" id = 'payMode'></div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">玩家ID：</label>
+				<input onchange = "changeSelectCon(7,this,'inp')"   class="search-select" type="tel" name="personId"  id ="personId" lay-verify="personId"  autocomplete="off" placeholder="请输入玩家ID" class="layui-input">
+			</div>
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">总销售金额:</label>
+				<div class="layui-input-inline">
+					<input type="text" class="layui-input" id="sumAmt" name="sumAmt" style="border:none;color: red" disabled="disabled" class="search-select">
+				</div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">总订单笔数:</label>
+				<div class="layui-input-inline">
+					<input type="text" class="layui-input" id="number" name="number" style="border:none;color: red" disabled="disabled" class="search-select">
+				</div>
+			</div>
+
+
+		</div>
+	</form>
+
+</div>
+
+<div class="shadow-content" style="margin:1.5rem;">
+	<table id="orderManage" lay-filter="tableFilter"></table>
+</div>
+</body>
+<script src="../../js/min-loader-next.js"></script>
+<script type="text/html" id="barDemo">
+	<!--<a class="layui-btn layui-btn-xs" lay-event="look">订单详情</a>-->
+	{{#  if(d.state == '00' && d.isUsed == '01' && d.pickupStt == '00' ){ }}
+	<a class="layui-btn layui-btn-xs" lay-event="cancel">订单作废</a>
+	{{#  } }}
+</script>
+<script>
+	$("#toggle").click(function() {
+		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+				"<i class='iconfont up iconSelect_drop-down'/></i>");
+		$("#content").slideToggle();
+	});
+	layui.use(['table','laydate','form'], function(){
+		var laydate = layui.laydate;
+		//日期范围
+		laydate.render({
+			elem: '#dates'
+			,range: true
+			,format:'yyyyMMdd'
+			,done: function(value, date, endDate){
+				changeSelectCon(1,"dates",'date',value)
+			}
+		});
+		form = layui.form;
+		initSelect('state', "IS_DRAW", "state", '', true);
+		initSelect('payMode', "PAY_TYPE", "payMode", '', true);
+		form.on('select(state)', function(data){
+			changeSelectCon(2, data.elem, "sel","state");
+		});
+		form.on('select(payMode)', function(data){
+			changeSelectCon(6, data.elem, "sel","payMode");
+		});
+		form.render();
+	});
+	var table;
+	layui.use('table', function(){
+		table = layui.table;
+		// 加载数据
+		table.render({
+			id: 'orderManage'
+			,elem: '#orderManage'
+			,limit:10
+			// ,height: 315
+			,url: 'ShOrderManageAction/queryOrder' //数据接口
+			,method: 'post'
+			,where:{MINView:"JSON"}
+			,page: true //开启分页
+			,cols: [[ //表头
+				{field:'num', title: '序号',width:'5%', type:'numbers', fixed: true, align: 'center'}
+				,{field: 'id', title: '编号', width:'10%', sort: true, fixed: 'left'}
+				,{field: 'productName', title: '产品信息', width:'12%'}
+				,{field: 'equipmentId', title: '机器编号', width:'8%'}
+				,{field: 'equipmentName', title: '机器名称', width:'8%'}
+				//,{field: 'equrelId', title: '货道编号', width:'8%'}
+				,{field: 'personId', title: '玩家ID', width:'8%'}
+				,{field: 'personName', title: '消费者信息', width:'8%'}
+				,{field: 'isDrawdesc', title: '状态', width:'8%'}
+				,{field: 'pickupSttdesc', title: '取货状态', width:'8%'}
+				,{field: 'payModedesc', title: '支付类型', width:'8%'}
+				,{field: 'orderAmt', title: '订单价格', width:'8%'}
+				,{field: 'createTime', title: '创建时间', width: '14%'}
+				,{field: 'operate', title: '操作', width: '8%', toolbar: '#barDemo',fixed: 'right'}
+			]]
+			,done: function(res, curr, count){
+				//如果是异步请求数据方式，res即为你接口返回的信息。
+				//如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
+				console.log(res);
+				//得到当前页码
+				console.log(curr);
+				$('#number').val(res.statistics.number);
+				$('#sumAmt').val(res.statistics.sumAmt);
+				//得到数据总量
+				console.log(count);
+			}
+			,even: true //开启隔行背景
+
+		});
+
+		// 监听工具条（操作）
+		table.on('tool(tableFilter)', function(obj){ //注：tool是工具条事件名，tableFilter是table原始容器的属性 lay-filter="对应的值"
+			var data = obj.data; //获得当前行数据
+			var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+			var tr = obj.tr; //获得当前行 tr 的DOM对象
+			if(layEvent === 'look'){ //详情
+				lookDetail(data);
+			}else if (layEvent ==='cancel'){
+				layer.confirm('真的要作废订单吗', function(index){
+					$.request({
+						action : '../../ShOrderManageAction/orderCancel',
+						data : {
+							id : id ,//订单id
+						},
+						success : function(data) {
+							//成功后刷新
+							var btn=$(".layui-laypage-btn")[0];
+							btn.click();
+							layer.alert('操作成功!', {
+								icon: 6,
+								title: "提示"
+							});
+						},
+						error : function(data) {
+							layer.alert('操作失败!', {
+								icon: 5,
+								title: "提示"
+							});
+						}
+					});
+				});
+			}
+		});
+
+		var $ = layui.$, active = {
+			getCheckData: function(){ //获取选中数据
+
+				var checkStatus = table.checkStatus('orderManage')
+						,data = checkStatus.data;
+				layer.alert(JSON.stringify(data));
+			}
+			,getCheckLength: function(){ //获取选中数目
+				var checkStatus = table.checkStatus('orderManage')
+						,data = checkStatus.data;
+				layer.msg('选中了：'+ data.length + ' 个');
+			}
+			,isAll: function(){ //验证是否全选
+				var checkStatus = table.checkStatus('orderManage');
+				layer.msg(checkStatus.isAll ? '全选': '未全选')
+			}
+			//搜索
+			,reload: function(){
+				loadAA();
+			}
+			//重置
+			,reset : function(){
+				$('#orderForm')[0].reset();
+				$("#conditions").html('<div class="fl f12-gray4-op mt4">所选条件：</div>');
+			}
+		};
+		$('.layui-btn').on('click', function(){
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+
+	});
+	function lookDetail(data) {
+		// 寄存当前数据
+		layui.sessionData("ROW_DATA", {key:"NOW_ROW", value : data});
+		openMainTabPage('101006-01', '订单详情', 'orderManage/details.html', '', '101006', loadAA);
+	}
+
+
+	function loadAA() {
+		//状态
+		var state = $("#state").find("option:selected").val();
+		//时间
+		var dates = $("#dates").val();
+		//订单号
+		var orderNo = $("#orderNo").val();
+
+		var equipmentId = $("#equipmentId").val();
+		var equipmentName = $("#equipmentName").val();
+		var freightwayId = $("#freightwayId").val();
+		var payMode = $("#payMode").find("option:selected").val();
+		var playerId = $("#personId").val();
+		//执行重载
+		table.reload('orderManage', {
+			page: {
+				curr: 1 //重新从第 1 页开始
+			}
+			,where: {
+				orderNo : orderNo,
+				state : state,
+				dates : dates,
+				equipmentId : equipmentId,
+				equipmentName : equipmentName,
+				freightwayId : freightwayId,
+				payMode : payMode,
+				playerId : playerId
+			}
+		});
+	}
+	function changeSelectCon(index, t, type, dateValue){
+		debugger;
+		if (type == "date") {
+			if (isEmpty(dateValue)) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		} else if (type == 'inp') {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		} else {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$(t).attr("id","subjects");
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		}
+	}
+	var array = new Array('订单编号','创建时间','状态','机台号','机器名称','货道号','支付方式','玩家ID');
+	function getSelectConHtml(index, t, type,dateValue){
+		var name;
+		var value;
+		if(type == "inp"){
+			value = t.value.substr(0,5)+"..";
+		}
+		if (type == "date") {
+			value = dateValue;
+		}
+		if(type == "sel"){
+			if(index == '2'){
+				value = $("#state").find("option:selected").text();
+			}
+			if(index == '6'){
+				value = $("#payMode").find("option:selected").text();
+			}
+
+		}
+		if (type == "date") {
+			name = $("#"+t).attr("id");
+		} else {
+			name = $(t).attr("id");
+		}
+		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+				'<div class="fl">' + array[index] + '</div>' +
+				':<i>'+value+'</i>' +
+				'<svg class="icon" aria-hidden="true">' +
+				'<use xlink:href="#iconicon_close1"></use>' +
+				'</svg>' +
+				'</div>';
+		return html;
+	}
+	function removeSearch(t) {
+		if ($(t).attr("name") == 'subjects') {
+			initSelect('state', "IS_DRAW", "state", ' ', true);
+			initSelect('payMode', "PAY_TYPE", "payMode", ' ', true);
+			form.render();
+			$(t).remove();
+		} else {
+			$("#"+$(t).attr("name")).val('');
+			$(t).remove();
+		}
+	}
+</script>
+
+</html>