20190904回收站

src/main/java/com/izouma/awesomeadmin/dao/ClientOrderMapper.xml

@@ -34,6 +34,7 @@
         <result column="album_price" property="albumPrice" jdbcType="DECIMAL"/>
         <result column="album_quantity" property="albumQuantity" jdbcType="INTEGER"/>
         <result column="order_name" property="orderName" jdbcType="VARCHAR"/>
+        <result column="recycle_flag" property="recycleFlag" jdbcType="CHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -100,6 +101,7 @@
             album_quantity,
 
             order_name,
+            recycle_flag,
 
         </trim>
     </sql>
@@ -213,6 +215,9 @@
             <if test="orderName!= null">
                 order_name,
             </if>
+            <if test="recycleFlag!= null">
+                recycle_flag,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -311,6 +316,9 @@
             <if test="orderName != null">
                 #{orderName,jdbcType=VARCHAR},
             </if>
+            <if test="recycleFlag != null">
+                #{recycleFlag,jdbcType=CHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.ClientOrder">
@@ -412,6 +420,9 @@
             <if test="orderName != null">
                 order_name= #{orderName,jdbcType=VARCHAR},
             </if>
+            <if test="recycleFlag != null">
+                recycle_flag= #{recycleFlag,jdbcType=CHAR},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
@@ -529,11 +540,22 @@
             <if test="record.orderName != null and !&quot;&quot;.equals(record.orderName)">
                 and order_name = #{record.orderName}
             </if>
+            <if test="record.recycleFlag != null and !&quot;&quot;.equals(record.recycleFlag)">
+                and recycle_flag = #{record.recycleFlag}
+            </if>
 
             <if test="record.statusStr != null and !&quot;&quot;.equals(record.statusStr)">
                 and status_flag in (${record.statusStr})
             </if>
 
+            <if test="record.searchBeginTime != null and !&quot;&quot;.equals(record.searchBeginTime)">
+                and create_time  <![CDATA[ >= ]]> #{record.searchBeginTime}
+            </if>
+            <if test="record.searchEndTime != null and !&quot;&quot;.equals(record.searchEndTime)">
+                and create_time  <![CDATA[ <= ]]> #{record.searchEndTime}
+            </if>
+
+
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR order_code LIKE concat('%',#{record.searchKey},'%')
@@ -706,6 +728,18 @@
                 and status_flag in (${record.statusStr})
             </if>
 
+            <if test="record.recycleFlag != null and !&quot;&quot;.equals(record.recycleFlag)">
+                and recycle_flag = #{record.recycleFlag}
+            </if>
+
+            <if test="record.searchBeginTime != null and !&quot;&quot;.equals(record.searchBeginTime)">
+                and create_time  <![CDATA[ >= ]]> #{record.searchBeginTime}
+            </if>
+            <if test="record.searchEndTime != null and !&quot;&quot;.equals(record.searchEndTime)">
+                and create_time  <![CDATA[ <= ]]> #{record.searchEndTime}
+            </if>
+
+
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR order_code LIKE concat('%',#{record.searchKey},'%')
@@ -878,6 +912,17 @@
                 and status_flag in (${statusStr})
             </if>
 
+            <if test="recycleFlag != null and !&quot;&quot;.equals(recycleFlag)">
+                and recycle_flag = #{recycleFlag}
+            </if>
+
+            <if test="searchBeginTime != null and !&quot;&quot;.equals(searchBeginTime)">
+                and create_time  <![CDATA[ >= ]]> #{searchBeginTime}
+            </if>
+            <if test="searchEndTime != null and !&quot;&quot;.equals(searchEndTime)">
+                and create_time  <![CDATA[ <= ]]> #{searchEndTime}
+            </if>
+
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR order_code LIKE concat('%',#{searchKey},'%')
@@ -1041,6 +1086,10 @@
                 and order_name = #{orderName}
             </if>
 
+            <if test="recycleFlag != null and !&quot;&quot;.equals(recycleFlag)">
+                and recycle_flag = #{recycleFlag}
+            </if>
+
         </where>
         LIMIT 1
     </select>

src/main/java/com/izouma/awesomeadmin/model/ClientOrder.java

@@ -43,6 +43,11 @@ public class ClientOrder {
     private Integer albumQuantity;
     private String orderName;
 
+    /**
+     * 回收站
+     */
+    private String recycleFlag;
+
     private List<UserOrder> userOrderList;
 
     private ProductInfo productInfo;
@@ -67,6 +72,11 @@ public class ClientOrder {
 
     private UserInfo userInfo;
 
+    private Date searchBeginTime;
+
+    private Date searchEndTime;
+
+
     public Integer getId() {
         return this.id;
     }
@@ -394,5 +404,29 @@ public class ClientOrder {
     public void setUserInfo(UserInfo userInfo) {
         this.userInfo = userInfo;
     }
+
+    public String getRecycleFlag() {
+        return recycleFlag;
+    }
+
+    public void setRecycleFlag(String recycleFlag) {
+        this.recycleFlag = recycleFlag;
+    }
+
+    public Date getSearchBeginTime() {
+        return searchBeginTime;
+    }
+
+    public void setSearchBeginTime(Date searchBeginTime) {
+        this.searchBeginTime = searchBeginTime;
+    }
+
+    public Date getSearchEndTime() {
+        return searchEndTime;
+    }
+
+    public void setSearchEndTime(Date searchEndTime) {
+        this.searchEndTime = searchEndTime;
+    }
 }
 

src/main/vue/src/pages/ClientOrder.vue

@@ -54,7 +54,10 @@
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="showFlag" label="显示标识">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="recycleFlag" label="回收站">
                 <el-input v-model="formData.showFlag" :disabled="'showFlag'==subColumn"></el-input>
+            </el-form-item>
+                <el-input v-model="formData.recycleFlag" :disabled="'recycleFlag'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="statusFlag" label="状态">
                 <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>

src/main/vue/src/pages/ClientOrders.vue

@@ -111,6 +111,8 @@
 
             <el-table-column v-if="isColumnShow('showFlag')" prop="showFlag" label="显示标识" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('recycleFlag')" prop="recycleFlag" label="回收站" min-width="100">
+            </el-table-column>
 
             <el-table-column v-if="isColumnShow('fee')" prop="fee" label="手续费" min-width="100">
             </el-table-column>
@@ -365,6 +367,11 @@ export default {
                     value: 'showFlag',
                     show: true,
                 },
+                {
+                    label: '回收站',
+                    value: 'recycleFlag',
+                    show: true,
+                },
                 {
                     label: '状态',
                     value: 'statusFlag',