|
@@ -1,5 +1,6 @@
|
|
|
package org.jeecg.modules.documents.orderData.controller;
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -65,8 +66,10 @@ public class SyOrderDataController extends JeecgController<SyOrderData, ISyOrder
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
HttpServletRequest req) {
|
|
|
- QueryWrapper<SyOrderData> queryWrapper = QueryGenerator.initQueryWrapper(syOrderData, req.getParameterMap());
|
|
|
- queryWrapper.orderByDesc("order_date");
|
|
|
+ if(oConvertUtils.isNotEmpty(syOrderData.getOrderDate())){
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ syOrderData.setDate(sdf.format(syOrderData.getOrderDate()));
|
|
|
+ }
|
|
|
Page<SyOrderData> page = new Page<SyOrderData>(pageNo, pageSize);
|
|
|
IPage<SyOrderData> pageList = syOrderDataService.queryList(syOrderData,page);
|
|
|
return Result.OK(pageList);
|