Merge remote-tracking branch 'origin/master'

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

@@ -3,9 +3,8 @@ package com.minpay.db.table.mapper;
 import com.minpay.db.table.model.VmProductInf;
 import com.minpay.db.table.model.VmProductInfExample;
 import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface VmProductInfMapper extends IMINMybatisEntityMapper<VmProductInf, String, VmProductInfExample> {
     /**

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

@@ -101,6 +101,14 @@ public class VmProductInf extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_product_inf.PRT_PRO_COST
+     *
+     * @mbggenerated
+     */
+    private String proCost;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column vm_product_inf.PRT_CREATE_USER
      *
      * @mbggenerated
@@ -421,6 +429,30 @@ public class VmProductInf extends AbstractMINBean {
 
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_product_inf.PRT_PRO_COST
+     *
+     * @return the value of vm_product_inf.PRT_PRO_COST
+     *
+     * @mbggenerated
+     */
+    public String getProCost() {
+        return proCost;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_product_inf.PRT_PRO_COST
+     *
+     * @param proCost the value for vm_product_inf.PRT_PRO_COST
+     *
+     * @mbggenerated
+     */
+    public void setProCost(String proCost) {
+        this.proCost = proCost == null ? null : proCost.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_product_inf.PRT_CREATE_USER
      *
      * @return the value of vm_product_inf.PRT_CREATE_USER

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

@@ -1126,6 +1126,84 @@ public class VmProductInfExample {
             return (Criteria) this;
         }
 
+        public Criteria andProCostIsNull() {
+            addCriterion("PRT_PRO_COST is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostIsNotNull() {
+            addCriterion("PRT_PRO_COST is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostEqualTo(String value) {
+            if(value == null ){
+                andProCostIsNull();
+            } else {
+                addCriterion("PRT_PRO_COST =", value, "proCost");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotEqualTo(String value) {
+            if(value == null ){
+                andProCostIsNotNull();
+            } else {
+                addCriterion("PRT_PRO_COST <>", value, "proCost");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostGreaterThan(String value) {
+            addCriterion("PRT_PRO_COST >", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostGreaterThanOrEqualTo(String value) {
+            addCriterion("PRT_PRO_COST >=", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostLessThan(String value) {
+            addCriterion("PRT_PRO_COST <", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostLessThanOrEqualTo(String value) {
+            addCriterion("PRT_PRO_COST <=", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostLike(String value) {
+            addCriterion("PRT_PRO_COST like", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotLike(String value) {
+            addCriterion("PRT_PRO_COST not like", value, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostIn(List<String> values) {
+            addCriterion("PRT_PRO_COST in", values, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotIn(List<String> values) {
+            addCriterion("PRT_PRO_COST not in", values, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostBetween(String value1, String value2) {
+            addCriterion("PRT_PRO_COST between", value1, value2, "proCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andProCostNotBetween(String value1, String value2) {
+            addCriterion("PRT_PRO_COST not between", value1, value2, "proCost");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateUserIsNull() {
             addCriterion("PRT_CREATE_USER is null");
             return (Criteria) this;

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

@@ -1,51 +1,52 @@
-<?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.VmProductInfMapper" >
-  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.VmProductInf" >
+<?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.VmProductInfMapper">
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.VmProductInf">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="PRT_ID" property="id" jdbcType="VARCHAR" />
-    <result column="PRT_CHANNEL" property="channel" jdbcType="VARCHAR" />
-    <result column="PRT_NAME" property="name" jdbcType="VARCHAR" />
-    <result column="PRT_CATEGORY_ID" property="categoryId" jdbcType="VARCHAR" />
-    <result column="PRT_MASTER_MAP" property="masterMap" jdbcType="VARCHAR" />
-    <result column="PRT_FMPIC" property="fmpic" jdbcType="VARCHAR" />
-    <result column="PRT_PICLIST" property="piclist" jdbcType="VARCHAR" />
-    <result column="PRT_DESCRIBE" property="describe" jdbcType="VARCHAR" />
-    <result column="PRT_PRO_VEDIO" property="proVedio" jdbcType="VARCHAR" />
-    <result column="PRT_BRANCHID" property="branchid" jdbcType="VARCHAR" />
-    <result column="PRT_SORT" property="sort" jdbcType="VARCHAR" />
-    <result column="PRT_STATE" property="state" jdbcType="CHAR" />
-    <result column="PRT_CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-    <result column="PRT_CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
-    <result column="PRT_MODIFY_USER" property="modifyUser" jdbcType="VARCHAR" />
-    <result column="PRT_MODIFY_TIME" property="modifyTime" jdbcType="VARCHAR" />
+    <id column="PRT_ID" jdbcType="VARCHAR" property="id" />
+    <result column="PRT_CHANNEL" jdbcType="VARCHAR" property="channel" />
+    <result column="PRT_NAME" jdbcType="VARCHAR" property="name" />
+    <result column="PRT_CATEGORY_ID" jdbcType="VARCHAR" property="categoryId" />
+    <result column="PRT_MASTER_MAP" jdbcType="VARCHAR" property="masterMap" />
+    <result column="PRT_FMPIC" jdbcType="VARCHAR" property="fmpic" />
+    <result column="PRT_PICLIST" jdbcType="VARCHAR" property="piclist" />
+    <result column="PRT_DESCRIBE" jdbcType="VARCHAR" property="describe" />
+    <result column="PRT_PRO_VEDIO" jdbcType="VARCHAR" property="proVedio" />
+    <result column="PRT_BRANCHID" jdbcType="VARCHAR" property="branchid" />
+    <result column="PRT_SORT" jdbcType="VARCHAR" property="sort" />
+    <result column="PRT_STATE" jdbcType="CHAR" property="state" />
+    <result column="PRT_PRO_COST" jdbcType="VARCHAR" property="proCost" />
+    <result column="PRT_CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+    <result column="PRT_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
+    <result column="PRT_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
+    <result column="PRT_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <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="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <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" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -56,29 +57,29 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <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="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <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" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -89,34 +90,34 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     PRT_ID, PRT_CHANNEL, PRT_NAME, PRT_CATEGORY_ID, PRT_MASTER_MAP, PRT_FMPIC, PRT_PICLIST, 
-    PRT_DESCRIBE, PRT_PRO_VEDIO, PRT_BRANCHID, PRT_SORT, PRT_STATE, PRT_CREATE_USER, 
+    PRT_DESCRIBE, PRT_PRO_VEDIO, PRT_BRANCHID, PRT_SORT, PRT_STATE, PRT_PRO_COST, PRT_CREATE_USER, 
     PRT_CREATE_TIME, PRT_MODIFY_USER, PRT_MODIFY_TIME
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.minpay.db.table.model.VmProductInfExample" >
+  <select id="selectByExample" parameterType="com.minpay.db.table.model.VmProductInfExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from vm_product_inf
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -126,7 +127,7 @@
     from vm_product_inf
     where PRT_ID = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -134,17 +135,17 @@
     delete from vm_product_inf
     where PRT_ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.VmProductInfExample" >
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.VmProductInfExample">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from vm_product_inf
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.minpay.db.table.model.VmProductInf" >
+  <insert id="insert" parameterType="com.minpay.db.table.model.VmProductInf">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -153,193 +154,202 @@
       PRT_CATEGORY_ID, PRT_MASTER_MAP, PRT_FMPIC, 
       PRT_PICLIST, PRT_DESCRIBE, PRT_PRO_VEDIO, 
       PRT_BRANCHID, PRT_SORT, PRT_STATE, 
-      PRT_CREATE_USER, PRT_CREATE_TIME, PRT_MODIFY_USER, 
-      PRT_MODIFY_TIME)
+      PRT_PRO_COST, PRT_CREATE_USER, PRT_CREATE_TIME, 
+      PRT_MODIFY_USER, PRT_MODIFY_TIME)
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{categoryId,jdbcType=VARCHAR}, #{masterMap,jdbcType=VARCHAR}, #{fmpic,jdbcType=VARCHAR}, 
       #{piclist,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR}, #{proVedio,jdbcType=VARCHAR}, 
       #{branchid,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{state,jdbcType=CHAR}, 
-      #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, 
-      #{modifyTime,jdbcType=VARCHAR})
+      #{proCost,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
+      #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmProductInf" >
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmProductInf">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into vm_product_inf
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         PRT_ID,
       </if>
-      <if test="channel != null" >
+      <if test="channel != null">
         PRT_CHANNEL,
       </if>
-      <if test="name != null" >
+      <if test="name != null">
         PRT_NAME,
       </if>
-      <if test="categoryId != null" >
+      <if test="categoryId != null">
         PRT_CATEGORY_ID,
       </if>
-      <if test="masterMap != null" >
+      <if test="masterMap != null">
         PRT_MASTER_MAP,
       </if>
-      <if test="fmpic != null" >
+      <if test="fmpic != null">
         PRT_FMPIC,
       </if>
-      <if test="piclist != null" >
+      <if test="piclist != null">
         PRT_PICLIST,
       </if>
-      <if test="describe != null" >
+      <if test="describe != null">
         PRT_DESCRIBE,
       </if>
-      <if test="proVedio != null" >
+      <if test="proVedio != null">
         PRT_PRO_VEDIO,
       </if>
-      <if test="branchid != null" >
+      <if test="branchid != null">
         PRT_BRANCHID,
       </if>
-      <if test="sort != null" >
+      <if test="sort != null">
         PRT_SORT,
       </if>
-      <if test="state != null" >
+      <if test="state != null">
         PRT_STATE,
       </if>
-      <if test="createUser != null" >
+      <if test="proCost != null">
+        PRT_PRO_COST,
+      </if>
+      <if test="createUser != null">
         PRT_CREATE_USER,
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         PRT_CREATE_TIME,
       </if>
-      <if test="modifyUser != null" >
+      <if test="modifyUser != null">
         PRT_MODIFY_USER,
       </if>
-      <if test="modifyTime != null" >
+      <if test="modifyTime != null">
         PRT_MODIFY_TIME,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="channel != null" >
+      <if test="channel != null">
         #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="name != null" >
+      <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="categoryId != null" >
+      <if test="categoryId != null">
         #{categoryId,jdbcType=VARCHAR},
       </if>
-      <if test="masterMap != null" >
+      <if test="masterMap != null">
         #{masterMap,jdbcType=VARCHAR},
       </if>
-      <if test="fmpic != null" >
+      <if test="fmpic != null">
         #{fmpic,jdbcType=VARCHAR},
       </if>
-      <if test="piclist != null" >
+      <if test="piclist != null">
         #{piclist,jdbcType=VARCHAR},
       </if>
-      <if test="describe != null" >
+      <if test="describe != null">
         #{describe,jdbcType=VARCHAR},
       </if>
-      <if test="proVedio != null" >
+      <if test="proVedio != null">
         #{proVedio,jdbcType=VARCHAR},
       </if>
-      <if test="branchid != null" >
+      <if test="branchid != null">
         #{branchid,jdbcType=VARCHAR},
       </if>
-      <if test="sort != null" >
+      <if test="sort != null">
         #{sort,jdbcType=VARCHAR},
       </if>
-      <if test="state != null" >
+      <if test="state != null">
         #{state,jdbcType=CHAR},
       </if>
-      <if test="createUser != null" >
+      <if test="proCost != null">
+        #{proCost,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         #{createTime,jdbcType=VARCHAR},
       </if>
-      <if test="modifyUser != null" >
+      <if test="modifyUser != null">
         #{modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null" >
+      <if test="modifyTime != null">
         #{modifyTime,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.minpay.db.table.model.VmProductInfExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.minpay.db.table.model.VmProductInfExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select count(*) from vm_product_inf
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update vm_product_inf
-    <set >
-      <if test="record.id != null" >
+    <set>
+      <if test="record.id != null">
         PRT_ID = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.channel != null" >
+      <if test="record.channel != null">
         PRT_CHANNEL = #{record.channel,jdbcType=VARCHAR},
       </if>
-      <if test="record.name != null" >
+      <if test="record.name != null">
         PRT_NAME = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.categoryId != null" >
+      <if test="record.categoryId != null">
         PRT_CATEGORY_ID = #{record.categoryId,jdbcType=VARCHAR},
       </if>
-      <if test="record.masterMap != null" >
+      <if test="record.masterMap != null">
         PRT_MASTER_MAP = #{record.masterMap,jdbcType=VARCHAR},
       </if>
-      <if test="record.fmpic != null" >
+      <if test="record.fmpic != null">
         PRT_FMPIC = #{record.fmpic,jdbcType=VARCHAR},
       </if>
-      <if test="record.piclist != null" >
+      <if test="record.piclist != null">
         PRT_PICLIST = #{record.piclist,jdbcType=VARCHAR},
       </if>
-      <if test="record.describe != null" >
+      <if test="record.describe != null">
         PRT_DESCRIBE = #{record.describe,jdbcType=VARCHAR},
       </if>
-      <if test="record.proVedio != null" >
+      <if test="record.proVedio != null">
         PRT_PRO_VEDIO = #{record.proVedio,jdbcType=VARCHAR},
       </if>
-      <if test="record.branchid != null" >
+      <if test="record.branchid != null">
         PRT_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       </if>
-      <if test="record.sort != null" >
+      <if test="record.sort != null">
         PRT_SORT = #{record.sort,jdbcType=VARCHAR},
       </if>
-      <if test="record.state != null" >
+      <if test="record.state != null">
         PRT_STATE = #{record.state,jdbcType=CHAR},
       </if>
-      <if test="record.createUser != null" >
+      <if test="record.proCost != null">
+        PRT_PRO_COST = #{record.proCost,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null">
         PRT_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.createTime != null" >
+      <if test="record.createTime != null">
         PRT_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       </if>
-      <if test="record.modifyUser != null" >
+      <if test="record.modifyUser != null">
         PRT_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.modifyTime != null" >
+      <if test="record.modifyTime != null">
         PRT_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -357,70 +367,74 @@
       PRT_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       PRT_SORT = #{record.sort,jdbcType=VARCHAR},
       PRT_STATE = #{record.state,jdbcType=CHAR},
+      PRT_PRO_COST = #{record.proCost,jdbcType=VARCHAR},
       PRT_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       PRT_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       PRT_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       PRT_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.VmProductInf" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.VmProductInf">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update vm_product_inf
-    <set >
-      <if test="channel != null" >
+    <set>
+      <if test="channel != null">
         PRT_CHANNEL = #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="name != null" >
+      <if test="name != null">
         PRT_NAME = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="categoryId != null" >
+      <if test="categoryId != null">
         PRT_CATEGORY_ID = #{categoryId,jdbcType=VARCHAR},
       </if>
-      <if test="masterMap != null" >
+      <if test="masterMap != null">
         PRT_MASTER_MAP = #{masterMap,jdbcType=VARCHAR},
       </if>
-      <if test="fmpic != null" >
+      <if test="fmpic != null">
         PRT_FMPIC = #{fmpic,jdbcType=VARCHAR},
       </if>
-      <if test="piclist != null" >
+      <if test="piclist != null">
         PRT_PICLIST = #{piclist,jdbcType=VARCHAR},
       </if>
-      <if test="describe != null" >
+      <if test="describe != null">
         PRT_DESCRIBE = #{describe,jdbcType=VARCHAR},
       </if>
-      <if test="proVedio != null" >
+      <if test="proVedio != null">
         PRT_PRO_VEDIO = #{proVedio,jdbcType=VARCHAR},
       </if>
-      <if test="branchid != null" >
+      <if test="branchid != null">
         PRT_BRANCHID = #{branchid,jdbcType=VARCHAR},
       </if>
-      <if test="sort != null" >
+      <if test="sort != null">
         PRT_SORT = #{sort,jdbcType=VARCHAR},
       </if>
-      <if test="state != null" >
+      <if test="state != null">
         PRT_STATE = #{state,jdbcType=CHAR},
       </if>
-      <if test="createUser != null" >
+      <if test="proCost != null">
+        PRT_PRO_COST = #{proCost,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
         PRT_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         PRT_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       </if>
-      <if test="modifyUser != null" >
+      <if test="modifyUser != null">
         PRT_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null" >
+      <if test="modifyTime != null">
         PRT_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       </if>
     </set>
     where PRT_ID = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.VmProductInf" >
+  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.VmProductInf">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -437,6 +451,7 @@
       PRT_BRANCHID = #{branchid,jdbcType=VARCHAR},
       PRT_SORT = #{sort,jdbcType=VARCHAR},
       PRT_STATE = #{state,jdbcType=CHAR},
+      PRT_PRO_COST = #{proCost,jdbcType=VARCHAR},
       PRT_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       PRT_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       PRT_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},

src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -5,19 +5,20 @@
 	<select id="selectOrderDetail" resultType="hashmap" parameterType="java.util.Map">
 	    SELECT
 		d.VOI_ID  				"orderNo",
-		d.VOI_PRODUCT_ID 		"productId",
-		d.VOI_PRODUCT_NAME 		"productName",
+		o.VOD_PRODUCT_ID 		"productId",
+		o.VOD_PRO_NAME 			"productName",
 		p.VCI_NAME 				"userName",
-		d.VOI_EQUREL_ID 		"equrelId",
+		o.VOD_PRO_EQU_REL_ID 		"equrelId",
 		r.VCI_EQUIPMENT_ID 		"machineNo",
 		d.VOI_ORDER_AMT 		"orderAmt",
 		d.VOI_CREATE_TIME 		"createTime",
 		d.VOI_PICKUP_NO 		"pickupNo",
 		d.VOI_PICKUP_TIME 		"pickUpTime",
 		d.VOI_PICKUP_STT 		"stt"
-	    FROM vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p
-		where d.VOI_EQUREL_ID = r.VCI_ID
+	    FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p
+		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and d.VOI_PERSON_ID = p.VCI_ID
+		and o.VOD_ORDER_ID = d.VOI_ID
     	<if test="pickupNo != null and pickupNo != ''">
 			AND	 d.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
 		</if>
@@ -25,7 +26,7 @@
 			AND	 d.VOI_PICKUP_STT  = #{pickUpState,jdbcType=VARCHAR}
 		</if>
 		<if test="machineNo != null and machineNo != ''">
-			AND	 d.VCI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	 o.VOD_PRO_EQU_REL_ID  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="creatdDtes != null and creatdDtes != ''">
 			and substr(VOI_CREATE_TIME,1,8) between substr((#{creatdDtes, jdbcType=VARCHAR}),1,8)
@@ -42,7 +43,7 @@
 	</select>
 	<select id="selectPickupRecord" resultType="hashmap" parameterType="java.util.Map">
 		SELECT
-		oi.VOI_EQUIPMENT_ID 	"",
+		oi.VOI_EQUIPMENT_ID 	"machineNo",
 		oi.VOI_ID 				"orderNo",
 		di.VDI_STATUS 			"stt",
 		oi.VOI_PICKUP_TIME 		"pickUpDates"
@@ -50,7 +51,7 @@
 		where di.VDI_ORD_DET_ID = od.VOD_DETAILS_ID
 		and VOD_ORDER_ID = oi.VOI_ID
 		<if test="machineNo != null and machineNo != ''">
-			AND	oi.VCI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	oi.VOI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="orderNo != null and orderNo != ''">
 			AND	oi.VOI_ID  = #{orderNo,jdbcType=VARCHAR}
@@ -116,13 +117,13 @@
 	</select>
 <!--	累计收入-->
 	<select id="selectCountIncome" resultType="java.lang.String" parameterType="java.util.Map">
-		select sum(PIF_TRXAMOUT)
+		select SUM(PIF_TRXAMOUT)
 		from vm_payment_inf
 		where PIF_STATUS = '1'
 	</select>
 	<!--	总机台数-->
 	<select id="selectCountDevice" resultType="java.lang.String" parameterType="java.util.Map">
-		SELECT SUM(PIF_TRXAMOUT)
+		SELECT COUNT(VEQ_ID)
 		FROM vm_equipment_inf
 		WHERE VEQ_STATE = '00'
 	</select>
@@ -145,14 +146,14 @@
 		ORDER BY aa.PRT_MODIFY_TIME DESC
 	</select>
 	<!--	总实际金额-->
-	<select id="selectAllSale" resultType="hashmap" parameterType="java.util.Map">
+	<select id="selectAllSale" resultType="java.lang.String" parameterType="java.util.Map">
 		SELECT SUM(VOI_ORDER_AMT)
 		FROM vm_order_inf
 		WHERE VOI_PRO_TYPE = '00'
 		AND VOI_STATE IN ('80', '00')
 	</select>
 	<!--	总商品成本-->
-	<select id="selectAllCost" resultType="hashmap" parameterType="java.util.Map">
+	<select id="selectAllCost" resultType="java.lang.String" parameterType="java.util.Map">
 		SELECT SUM(proSum) FROM (
 			SELECT aa.PRT_PRO_COST * SUM(bb.VOD_PRO_NUMS) AS proSum
 			FROM vm_product_inf aa, vm_order_details bb

src/main/webapp/admin/invCardManage/invCardManage.html

@@ -14,7 +14,6 @@
         <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>
-            <button class="layui-btn order-bnt2" id = "addUser">添加</button>
             <a href="#" id="toggle" class="top">收起</a>
         </div>
     </div>
@@ -22,11 +21,11 @@
         <div class="order-select back-border" id="content">
             <div class="layui-inline">
                 <label class="f12-gray4">机台号 ：</label>
-                <input type="tel" name="machineNo"  id ="machineNo" autocomplete="off" placeholder="请输入机台号" class="layui-input">
+                <input type="tel" name="machineNo"  id ="machineNo" onchange = "changeSelectCon(0,this,'inp')" placeholder="请输入机台号" class="search-select">
             </div>
             <div class="layui-inline">
                 <label class="f12-gray4">取货码：</label>
-                <input type="tel" name="pickUpCode"  id ="pickUpCode" autocomplete="off" placeholder="请输入取货码" class="layui-input">
+                <input type="tel" name="pickUpCode" id ="pickUpCode" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入取货码" class="search-select">
             </div>
             <div class="d-dashed" style="margin: 10px 0;"></div>
             <div class="layui-inline">
@@ -72,7 +71,7 @@
 		   ,range: true
 		   ,format:'yyyyMMdd'
 		   ,done: function(value, date, endDate){
-    			  changeSelectCon(1,"dates",'date',value)
+    			  changeSelectCon(1,"creatdDtes",'date',value)
   			}
 		});
 
@@ -81,13 +80,13 @@
 		   ,range: true
 		   ,format:'yyyyMMdd'
 		   ,done: function(value, date, endDate){
-    			  changeSelectCon(1,"dates",'date',value)
+    			  changeSelectCon(2,"pickUpDates",'date',value)
   			}
 		});
 		form = layui.form;
 		initSelect('pickUpState', "PICKUP_STT", "pickUpState", ' ', true);
 		form.on('select(pickUpState)', function(data){
-   			changeSelectCon(2, data.elem, "sel","pickUpState");
+   			changeSelectCon(3, data.elem, "sel","pickUpState");
    		});
 		form.render();
 	})
@@ -205,12 +204,81 @@
 	        ,where: {
 	        	machineNo : machineNo,
 	        	pickUpCode : pickUpCode,
-	        	stt : state,
+	        	pickUpState : pickUpState,
 	        	creatdDtes : creatdDtes,
 	        	pickUpDates : pickUpDates
 	        }
       	});
 	}
+	//查询
+	function changeSelectCon(index, t, type, dateValue){
+		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",dateValue);
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		}
+	}
+	var array = new Array('机台号','取货码','状态','创建日期','取货日期');
+	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" && dateValue =="state"){
+			value = $("#state").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 class="iconfont">'+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") == 'state') {
+			initSelect('pickUpState', "PICKUP_STT", "pickUpState", ' ', true);
+			form.render();
+			$(t).remove();
+		} else {
+			$("#"+$(t).attr("name")).val('');
+			$(t).remove();
+		}
+	}
 </script>
 </body>
 </html>