From 1bf7a7cb5be7c82a3d0c615429e272fd6860ecbe Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期六, 28 八月 2021 08:28:32 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into HEAD
---
src/main/java/com/zy/ints/controller/WaitMatinController.java | 94 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index a6520af..ac822f5 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -9,6 +9,8 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
import com.zy.common.entity.KeyValueVo;
@@ -16,12 +18,10 @@
import com.zy.ints.entity.WaitMatin;
import com.zy.ints.service.WaitMatinService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class WaitMatinController extends BaseController {
@@ -34,20 +34,32 @@
@RequestMapping(value = "/waitMatin/head/page/auth")
@ManagerAuth
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"));
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ 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 ***********************************************/
@@ -58,7 +70,7 @@
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
.andNew().like("mat_no", condition).or().like("mat_name", condition)
- .orderBy("create_time", false);
+ .orderBy("appe_time", false);
List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
for (MatCode mat : mats) {
@@ -113,28 +125,66 @@
@RequestMapping(value = "/waitMatin/add/auth")
@ManagerAuth
- public R add(WaitMatin waitMatin) {
- waitMatinService.insert(waitMatin);
- return R.ok();
+ @Transactional
+ public R add(@RequestBody List<WaitMatin> waitMatins) {
+ if (Cools.isEmpty(waitMatins)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (waitMatinService.selectCount(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo())) > 0) {
+ return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
+ }
+ int i = 1;
+ Date now = new Date();
+ for (WaitMatin waitMatin : waitMatins) {
+ waitMatin.setSeqNo(i);
+ waitMatin.setAppeTime(now);
+ waitMatin.setAppeUser(getUserId());
+ waitMatin.setModiTime(now);
+ waitMatin.setModiUser(getUserId());
+ if (!waitMatinService.insert(waitMatin)) {
+ throw new CoolException("娣诲姞鍗曟嵁鏄庣粏澶辫触");
+ }
+ i++;
+ }
+ 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")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- waitMatinService.deleteById(id);
+ public R delete(@RequestParam String billNo){
+ if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", billNo))) {
+ throw new CoolException("鍒犻櫎鍗曟嵁鏄庣粏澶辫触");
}
- return R.ok();
+ return R.ok("鍒犻櫎鎴愬姛");
}
@RequestMapping(value = "/waitMatin/export/auth")
--
Gitblit v1.9.1