From 9468f9216cb9a72af52d5a51e658b5a0b5dc92d4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 27 八月 2021 16:20:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/controller/WaitMatinController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index fd05e4c..e84ac49 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -48,6 +48,19 @@
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 ***********************************************/
@@ -133,14 +146,33 @@
return R.ok("娣诲姞鎴愬姛");
}
- @RequestMapping(value = "/waitMatin/update/auth")
+ @RequestMapping(value = "/waitMatin/modify/auth")
@ManagerAuth
- public R update(WaitMatin waitMatin){
- if (Cools.isEmpty(waitMatin) || null==waitMatin.getSeqNo()){
+ @Transactional
+ public R update(@RequestBody List<WaitMatin> waitMatins){
+ if (Cools.isEmpty(waitMatins)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ Date now = new Date();
+ List<WaitMatin> oldWaitMatin = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()));
+ Date appeTime = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeTime():now;
+ Long appeUser = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeUser():getUserId();
+ if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()))) {
return R.error();
}
- waitMatinService.updateById(waitMatin);
- return R.ok();
+ int i = 1;
+ for (WaitMatin waitMatin : waitMatins) {
+ waitMatin.setSeqNo(i);
+ waitMatin.setAppeTime(appeTime);
+ waitMatin.setAppeUser(appeUser);
+ waitMatin.setModiTime(now);
+ waitMatin.setModiUser(getUserId());
+ if (!waitMatinService.insert(waitMatin)) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏澶辫触");
+ }
+ i++;
+ }
+ return R.ok("淇敼鎴愬姛");
}
@RequestMapping(value = "/waitMatin/delete/auth")
--
Gitblit v1.9.1