订单列表修改

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ObjectExcelView.java

@@ -20,6 +20,16 @@ import org.springframework.web.servlet.view.document.AbstractExcelView;
  */
 public class ObjectExcelView extends AbstractExcelView{
 
+	private String name = "";
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	/**
 	 * model参数为：
 	 * 	fileName: 下载的文件名称
@@ -35,13 +45,19 @@ public class ObjectExcelView extends AbstractExcelView{
 		
 		// 准备文件名
 		Date date = new Date();
-		StringBuffer filename = new StringBuffer("iamberry-");
+		StringBuffer filename = new StringBuffer("soodo-");
 		String modelFileName = model.get("fileName").toString();
-		filename.append(DateTimeUtil.format(date, "yyyyMMddHHmmss-")).append(modelFileName == null ? "default" : modelFileName);
+		if(name == null || "".equals(name)){
+			filename.append(DateTimeUtil.format(date, "yyyyMMdd-"));
+		}else{
+			filename.append(name);
+		}
+		filename.append(modelFileName == null ? "default" : modelFileName);
+
 		// 工作薄对象
 		HSSFSheet sheet;
 		HSSFCell cell;
-		sheet = workbook.createSheet("iamberry-sheet");
+		sheet = workbook.createSheet("soodo-sheet");
 		
 		// 设置返回内容
 		response.setContentType("application/octet-stream");

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -965,7 +965,16 @@
 				FROM
 					tb_iamberry_child_channel cc
 		) chan ON t.sales_channel_type = chan.sales_channel_type AND t.sales_channel_id = chan.sales_channel_id
-		WHERE t.sales_status in (2,5,9,10,11,12)
+		<where>
+			t.sales_status IN (2,5,9,10,11,12)
+			<if test="beginDate != null">
+				<![CDATA[AND DATE_FORMAT(t.SALES_CREATE_DATE, '%Y-%m-%d') >= ]]>DATE_FORMAT(#{beginDate},'%Y-%m-%d')
+			</if>
+			<if test="endDate != null">
+				<![CDATA[AND DATE_FORMAT(t.SALES_CREATE_DATE, '%Y-%m-%d') <= ]]>DATE_FORMAT(#{endDate},'%Y-%m-%d')
+			</if>
+		</where>
+		ORDER BY t.SALES_CREATE_DATE DESC
 	</select>
 
 	<select id="getOrderItemListToExcel" resultType="OrderItem" parameterType="String" >

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -1070,8 +1070,7 @@ public class AdminOrderHandlers {
      */
     @ResponseBody
     @RequestMapping(value = "/download_order")
-    public ModelAndView downloadOrder(HttpServletRequest request){
-        Order order = new Order();
+    public ModelAndView downloadOrder(HttpServletRequest request,Order order){
         List<Order> orderList = adminOrderService.getOrderListToExcel(order);
 
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1196,6 +1195,20 @@ public class AdminOrderHandlers {
         model.put("varList", countexts);
 
         ObjectExcelView erv = new ObjectExcelView();
+        SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+        String name = "";
+        if(order.getBeginDate() != null){
+            name += sd.format(order.getBeginDate());
+        }else{
+            name += "2018-01-01";
+        }
+        name += "-";
+        if( order.getEndDate() != null){
+            name += sd.format(order.getEndDate());
+        }else{
+            name += sd.format(new Date());
+        }
+        erv.setName(name);
         ModelAndView mv = new ModelAndView(erv, model);
         return mv;
     }

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -208,7 +208,7 @@
 				<button name="" id="submitBtn" class="btn btn-danger" type="submit">
 					<i class="Hui-iconfont">&#xe665;</i> 搜索
 				</button>
-				<button style="display: none" name="" id="" class="btn btn-danger" type="button" onclick="downloadExcel()">下载订单</button>
+				<button style="" name="" class="btn btn-danger" type="button" onclick="downloadExcel()">下载订单</button>
 				<button style="display: none" name="" id="" class="btn btn-danger" type="button" onclick="downloadExcel2()">下载订单2</button>
 			</form>
 		</div>
@@ -610,7 +610,16 @@
 				}
 
 				function downloadExcel(){
-                    window.location=" <%=request.getContextPath()%>/admin/order/download_order";
+                    var beginDate = $("#beginDate").val();
+                    var endDate = $("#endDate").val();
+                    if(beginDate == "" && endDate == ""){
+                        var dd = new Date();
+                        beginDate = dd.getFullYear() + "-" + ( dd.getMonth()+1) + "-" + 01;
+
+                        dd.setMonth(dd.getMonth()+1);//获取下月月份
+                        endDate = dd.getFullYear() + "-" + ( dd.getMonth()+1) + "-" + 01;
+					}
+                    window.location=" <%=request.getContextPath()%>/admin/order/download_order?beginDate="+ beginDate +"&endDate=" + endDate;
 				}
 
                 function downloadExcel2(){