From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 441 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 296 insertions(+), 145 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 92f5114..2f8de48 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -1,9 +1,11 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.ReportQueryMapper;
@@ -22,6 +24,7 @@
/**
* 鏃ュ織缁熻鎺у埗鍣ㄥ眰
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
@@ -29,163 +32,311 @@
@RequestMapping("/report")
public class ReportQueryController extends BaseController {
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
- //------------------搴撲綅浣跨敤缁熻--------------------------------------
- @RequestMapping("/viewStockUseList.action")
- public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStockUseBean bean = new ViewStockUseBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
- int count = reportQueryMapper.getViewStockUseCount(bean);
- Page<ViewStockUseBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------搴撲綅浣跨敤缁熻--------------------------------------
+ @RequestMapping("/viewStockUseList.action")
+ public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStockUseBean bean = new ViewStockUseBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ List<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(bean);
+ int count = reportQueryMapper.getViewStockUseCount(bean);
+ Page<ViewStockUseBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStockUseExport.action")
- @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
- public R viewStockUseExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
- return R.ok(exportSupport(list, fields));
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStockUseExport.action")
+ @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
+ public R viewStockUseExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------搴撳瓨婊炵暀缁熻--------------------------------------
- @RequestMapping("/viewStayTimeList.action")
- public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStayTimeBean bean = new ViewStayTimeBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- bean.setLoc_no(String.valueOf(param.get("loc_no")));
- List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
- int count = reportQueryMapper.getViewStayTimeCount(bean);
- Page<ViewStayTimeBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------搴撳瓨婊炵暀缁熻--------------------------------------
+ @RequestMapping("/viewStayTimeList.action")
+ public Map<String, Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStayTimeBean bean = new ViewStayTimeBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("loc_no"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setLoc_no(locNo);
+ }
+ List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
+ int count = reportQueryMapper.getViewStayTimeCount(bean);
+ Page<ViewStayTimeBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStayTimeExport.action")
- @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
- public R viewStayTimeExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
- return R.ok(exportSupport(list, fields));
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStayTimeExport.action")
+ @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+ public R viewStayTimeExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //-----------------搴撳瓨MAP鍥�--------------------------------------
- @RequestMapping("/viewLocMapList/rows.action")
- public R queryViewLocMapRows(){
- return R.ok().add(reportQueryMapper.getViewLocRowTotal());
- }
+ //-----------------搴撳瓨MAP鍥�--------------------------------------
+ @RequestMapping("/viewLocMapList/rows.action")
+ public R queryViewLocMapRows() {
+ return R.ok().add(reportQueryMapper.getViewLocRowTotal());
+ }
- @RequestMapping("/viewLocMapList.action")
- public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row){
- // 鑾峰彇鎺掔骇鏁版嵁
- // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
- List<String> bays = reportQueryMapper.getViewLocBayCount(row);
- // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
- bays.add(0, "");
- // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
- List<String> levs = reportQueryMapper.getViewLocLevCount(row);
- List<Map<String, Object>> body = new ArrayList<>();
- for (String lev : levs){
- // 鑾峰彇灞傜骇鏁版嵁
- List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
- // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
- dtos.add(0, new ViewLocMapDto(null ,null, lev));
- Map<String, Object> map = new HashMap<>();
- map.put("loc", dtos);
- body.add(map);
- }
- Map<String, Object> result = new HashMap<>();
- result.put("title", bays);
- result.put("body", body);
- return R.ok(result);
- }
+ @RequestMapping("/viewLocMapList.action")
+ public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1") Integer row) {
+ // 鑾峰彇鎺掔骇鏁版嵁
+ // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
+ List<String> bays = reportQueryMapper.getViewLocBayCount(row);
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ bays.add(0, "");
+ // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
+ List<String> levs = reportQueryMapper.getViewLocLevCount(row);
+ List<Map<String, Object>> body = new ArrayList<>();
+ for (String lev : levs) {
+ // 鑾峰彇灞傜骇鏁版嵁
+ List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ dtos.add(0, new ViewLocMapDto(null, null, lev));
+ Map<String, Object> map = new HashMap<>();
+ map.put("loc", dtos);
+ body.add(map);
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("title", bays);
+ result.put("body", body);
+ return R.ok(result);
+ }
- //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
- @RequestMapping("/viewInOutList.action")
- public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewInOutBean bean = new ViewInOutBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
- int count = reportQueryMapper.getViewInOutCount(bean);
- Page<ViewInOutBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
+ @RequestMapping("/viewInOutList.action")
+ public Map<String, Object> viewInOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ if (!Cools.isEmpty(param.get("modi_time"))) {
+ String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
+ bean.setBegin_date(dates[0]);
+ bean.setEnd_date(dates[1]);
+ }
+ int count = 0;
+ List<ViewInOutBean> list = new ArrayList<>();
+ if (param.get("type") == null || param.get("type").equals(1)) {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ count = reportQueryMapper.getViewInOutCountDay(bean);
+ } else if (param.get("type").equals("2")) {
+ list = reportQueryMapper.queryViewInOutListMonth(bean);
+ count = reportQueryMapper.getViewInOutCountMonth(bean);
+ } else if (param.get("type").equals("3")) {
+ list = reportQueryMapper.queryViewInOutListYear(bean);
+ count = reportQueryMapper.getViewInOutCountYear(bean);
+ } else {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ count = reportQueryMapper.getViewInOutCountDay(bean);
+ }
+// List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
+ Page<ViewInOutBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewInOutExport.action")
- @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
- public R viewInOutExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
- return R.ok(exportSupport(list, fields));
- }
+ @RequestMapping("/viewInOutList/count")
+ public R getAllCount() {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(99999);
+ bean.setPageNumber(1);
+ List<ViewInOutBean> list = new ArrayList<>();
+ Map<String, Double> map = new HashMap<>();
+ Double in = 0.0;
+ Double out = 0.0;
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ for (ViewInOutBean bean1 : list) {
+ in += bean1.getSto_qty().doubleValue();
+ out += bean1.getRet_qty().doubleValue();
+ }
+ map.put("in", in);
+ map.put("out", out);
+ return R.ok(map);
+ }
- //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkInList.action")
- public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
- int count = reportQueryMapper.getViewWorkInCount(bean);
- Page<ViewWorkInBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ *
+ * @return
+ */
+ @RequestMapping("/viewInOutList/date/count")
+ public R getCount(@RequestBody Map<String, String> param) {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(99999);
+ bean.setPageNumber(1);
+ if (!Cools.isEmpty(param.get("modi_time"))) {
+ String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
+ bean.setBegin_date(dates[0]);
+ bean.setEnd_date(dates[1]);
+ }
+ Map<String, Double> map = new HashMap<>();
+ Double in = 0.0;
+ Double out = 0.0;
+ List<ViewInOutBean> list = new ArrayList<>();
+ if (param.get("type") == null || param.get("type").equals(1)) {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ } else if (param.get("type").equals("2")) {
+ list = reportQueryMapper.queryViewInOutListMonth(bean);
+ } else if (param.get("type").equals("3")) {
+ list = reportQueryMapper.queryViewInOutListYear(bean);
+ } else {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
- //excel瀵煎嚭
- @RequestMapping("/viewWorkInExport.action")
- @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkInExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQuery_date(bean.getQuery_date());
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
- return R.ok(exportSupport(list, fields));
- }
+ }
+ for (ViewInOutBean bean1 : list) {
+ in += bean1.getSto_qty().doubleValue();
+ out += bean1.getRet_qty().doubleValue();
+ }
+ map.put("in", in);
+ map.put("out", out);
+ return R.ok(map);
+ }
- //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkOutList.action")
- public R viewWorkOutList(ViewWorkInBean bean){
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
- int count = reportQueryMapper.getViewWorkOutCount(bean);
- Page<ViewWorkInBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewInOutExport.action")
+ @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
+ public R viewInOutExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewWorkOutExport.action")
- @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkOutExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQuery_date(bean.getQuery_date());
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
- return R.ok(exportSupport(list, fields));
- }
+ //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkInList.action")
+ public Map<String, Object> viewWorkInList(ViewWorkInBean bean) {
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
+ int count = reportQueryMapper.getViewWorkInCount(bean);
+ Page<ViewWorkInBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
+
+ /**
+ * 鏃ュ叆搴撴眹鎬绘煡璇�
+ *
+ * @return
+ */
+ @RequestMapping("/viewWorkCountInList.action")
+ public R viewWorkCountInList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime, endTime);
+ Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime, endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime, endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page", page);
+ result.put("sum", sum);
+ return R.ok(result);
+ }
+
+ /**
+ * 鏃ュ嚭搴撴眹鎬�
+ */
+ @RequestMapping("/viewWorkCountOutList.action")
+ public R viewWorkCountOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime, endTime);
+ Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime, endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime, endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page", page);
+ result.put("sum", sum);
+ return R.ok(result);
+ }
+
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkInExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkInExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkOutList.action")
+ public R viewWorkOutList(ViewWorkInBean bean) {
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
+ int count = reportQueryMapper.getViewWorkOutCount(bean);
+ Page<ViewWorkInBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
+
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkOutExport.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkOutExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
}
--
Gitblit v1.9.1