From 51a1786ef3e4e016d5f3f7bad8c2e2e8a84247a6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 22 三月 2026 18:42:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index 321b8f6..e094157 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basWrkStatus/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(basWrkStatusService.selectById(String.valueOf(id)));
+ return R.ok(basWrkStatusService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basWrkStatus/list/auth")
@@ -38,21 +38,22 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basWrkStatusService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ return R.ok(basWrkStatusService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
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]));
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.like(column, val);
}
}
}
@@ -64,7 +65,7 @@
return R.error();
}
if (null == basWrkStatus.getWrkSts()){
- basWrkStatusService.insert(basWrkStatus);
+ basWrkStatusService.save(basWrkStatus);
} else {
basWrkStatusService.updateById(basWrkStatus);
}
@@ -78,7 +79,7 @@
basWrkStatus.setModiTime(new Date());
basWrkStatus.setAppeUser(getUserId());
basWrkStatus.setAppeTime(new Date());
- basWrkStatusService.insert(basWrkStatus);
+ basWrkStatusService.save(basWrkStatus);
return R.ok();
}
@@ -96,13 +97,26 @@
@RequestMapping(value = "/basWrkStatus/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
- List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
- if (Cools.isEmpty(list)){
+ public R delete(@RequestParam(value = "ids[]", required = false) Long[] ids,
+ @RequestParam(value = "param", required = false) String param){
+ List<Long> deleteIds = new ArrayList<>();
+ if (!Cools.isEmpty(ids)) {
+ deleteIds.addAll(Arrays.asList(ids));
+ } else if (!Cools.isEmpty(param)) {
+ List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
+ if (!Cools.isEmpty(list)) {
+ for (BasWrkStatus entity : list) {
+ if (!Cools.isEmpty(entity) && entity.getWrkSts() != null) {
+ deleteIds.add(entity.getWrkSts());
+ }
+ }
+ }
+ }
+ if (Cools.isEmpty(deleteIds)){
return R.error();
}
- for (BasWrkStatus entity : list){
- basWrkStatusService.delete(new EntityWrapper<>(entity));
+ for (Long id : deleteIds){
+ basWrkStatusService.removeById(id);
}
return R.ok();
}
@@ -111,19 +125,19 @@
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkStatus"));
convert(map, wrapper);
- List<BasWrkStatus> list = basWrkStatusService.selectList(wrapper);
+ List<BasWrkStatus> list = basWrkStatusService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basWrkStatusQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<>();
wrapper.like("wrk_desc", condition);
- Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasWrkStatus> page = basWrkStatusService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasWrkStatus basWrkStatus : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -137,8 +151,8 @@
@RequestMapping(value = "/basWrkStatus/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasWrkStatus> wrapper = new EntityWrapper<BasWrkStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkStatusService.selectOne(wrapper)){
+ QueryWrapper<BasWrkStatus> wrapper = new QueryWrapper<BasWrkStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basWrkStatusService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1