From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/PackController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 0d72bf8..0a24b3f 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -49,7 +49,7 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy("settle").orderBy("create_time", false);
}
return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -79,7 +79,7 @@
pack.setCreateBy(getUserId());
pack.setCreateTime(now);
if (!packService.insert(pack)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鏁版嵁娣诲姞澶辫触");
}
Mat mat = new Mat();
mat.setTagId(tagService.getTop().getId());
@@ -88,8 +88,9 @@
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
+ mat.setMemo("鎵撳寘涓婄嚎");
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鎵撳寘涓婄嚎澶辫触");
}
return R.ok();
}
@@ -98,7 +99,7 @@
@ManagerAuth
public R update(Pack pack){
if (Cools.isEmpty(pack) || null==pack.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
pack.setUpdateBy(getUserId());
pack.setUpdateTime(new Date());
--
Gitblit v1.9.1