From ab41622d30946f83b34e5a5d881741237628f6f1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 14:26:39 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index f39f3f5..991e6fc 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasCrnStatus;
-import com.zy.asrs.service.BasCrnStatusService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasCrnStatus;
+import com.zy.asrs.service.BasCrnStatusService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,32 +32,37 @@
@RequestMapping(value = "/basCrnStatus/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false, defaultValue = "stsNo") String orderByField,
+ @RequestParam(required = false, defaultValue = "asc") String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("sts_no", true);
+ }
return R.ok(basCrnStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ 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.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/basCrnStatus/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佹坊鍔�")
public R add(BasCrnStatus basCrnStatus) {
basCrnStatus.setModiUser(getUserId());
basCrnStatus.setModiTime(new Date());
@@ -67,10 +72,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth
- public R update(BasCrnStatus basCrnStatus){
- if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
+ @RequestMapping(value = "/basCrnStatus/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
+ public R update(BasCrnStatus basCrnStatus) {
+ if (Cools.isEmpty(basCrnStatus) || null == basCrnStatus.getStsNo()) {
return R.error();
}
basCrnStatus.setModiUser(getUserId());
@@ -80,21 +85,21 @@
}
@RequestMapping(value = "/basCrnStatus/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam String param){
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
+ public R delete(@RequestParam String param) {
List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnStatus entity : list){
+ for (BasCrnStatus entity : list) {
basCrnStatusService.delete(new EntityWrapper<>(entity));
}
return R.ok();
}
@RequestMapping(value = "/basCrnStatus/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnStatus"));
@@ -110,7 +115,7 @@
wrapper.like("sts_desc", condition);
Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnStatus basCrnStatus : page.getRecords()){
+ for (BasCrnStatus basCrnStatus : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnStatus.getStsNo());
map.put("value", basCrnStatus.getStsDesc());
@@ -123,7 +128,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnStatus> wrapper = new EntityWrapper<BasCrnStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnStatusService.selectOne(wrapper)){
+ if (null != basCrnStatusService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1