From 889c68898bba81f90bae9923c01e40a5052cc843 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 27 八月 2021 15:38:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/controller/WaitMatinController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index 1ebf34e..55e5013 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -36,18 +36,31 @@
public R headPage(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
- String val = String.valueOf(param.get("modi_time"));
+ if (!Cools.isEmpty(param.get("appe_time"))){
+ String val = String.valueOf(param.get("appe_time"));
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
param.put("startTime", DateUtils.convert(dates[0]));
param.put("endTime", DateUtils.convert(dates[1]));
- param.remove("modi_time");
+ param.remove("appe_time");
}
}
return R.ok(waitMatinService.getHeadPage(toPage(curr, limit, param, WaitMatin.class)));
}
+ @RequestMapping(value = "/waitMatin/detl/list/auth")
+ @ManagerAuth
+ public R detlPage(@RequestParam String billNo){
+ if (Cools.isEmpty(billNo)){
+ return R.parse(BaseRes.PARAM);
+ }
+ List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo));
+ if (Cools.isEmpty(waitMatins)) {
+ return R.parse(BaseRes.EMPTY);
+ }
+ return R.ok().add(waitMatins);
+ }
+
/*************************************** xm-select ***********************************************/
--
Gitblit v1.9.1