|
|
@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
|
|
|
import com.alibaba.dubbo.common.utils.CollectionUtils;
|
|
|
import com.alibaba.dubbo.common.utils.StringUtils;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.uas.platform.b2b.core.util.DateFormatUtils;
|
|
|
import com.uas.platform.b2b.model.MakeOrder;
|
|
|
import com.uas.platform.b2b.model.MakeOrderReply;
|
|
|
import com.uas.platform.b2b.model.SearchFilter;
|
|
|
@@ -34,7 +35,6 @@ import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -326,9 +326,8 @@ public class MakeOrderController {
|
|
|
public ModelAndView exportOrders(PageParams params, String searchFilter) {
|
|
|
params.setPage(1);
|
|
|
params.setCount(SearchConstants.TOP_NUM);
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
- modelAndView.addObject("dateFormat", dateFormat);
|
|
|
+ modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
|
|
|
modelAndView.addObject("state", "全部");
|
|
|
modelAndView.addObject("data", getAllMakeOrders(params, searchFilter).getContent());
|
|
|
modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表_全部"));
|
|
|
@@ -346,9 +345,8 @@ public class MakeOrderController {
|
|
|
public ModelAndView exportTodoOrders(PageParams params, String searchFilter) {
|
|
|
params.setPage(1);
|
|
|
params.setCount(SearchConstants.TOP_NUM);
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
- modelAndView.addObject("dateFormat", dateFormat);
|
|
|
+ modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
|
|
|
modelAndView.addObject("state", "待回复");
|
|
|
modelAndView.addObject("data", getToDoMakeOrders(params, searchFilter).getContent());
|
|
|
modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表 _待回复"));
|
|
|
@@ -366,9 +364,8 @@ public class MakeOrderController {
|
|
|
public ModelAndView exportDoneOrders(PageParams params, String searchFilter) {
|
|
|
params.setPage(1);
|
|
|
params.setCount(SearchConstants.TOP_NUM);
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
- modelAndView.addObject("dateFormat", dateFormat);
|
|
|
+ modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
|
|
|
modelAndView.addObject("state", "已回复");
|
|
|
modelAndView.addObject("data", getDoneMakeOrders(params, searchFilter).getContent());
|
|
|
modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表_已回复"));
|
|
|
@@ -386,9 +383,8 @@ public class MakeOrderController {
|
|
|
public ModelAndView exportEndOrders(PageParams params, String searchFilter) {
|
|
|
params.setPage(1);
|
|
|
params.setCount(SearchConstants.TOP_NUM);
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
ModelAndView modelAndView = new ModelAndView();
|
|
|
- modelAndView.addObject("dateFormat", dateFormat);
|
|
|
+ modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
|
|
|
modelAndView.addObject("state", "已结案");
|
|
|
modelAndView.addObject("data", getEndMakeOrders(params, searchFilter).getContent());
|
|
|
modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表_已结案"));
|