From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OrderSettleController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderSettleController.java b/src/main/java/com/zy/asrs/controller/OrderSettleController.java
index 12cd2dd..8a6290d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderSettleController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderSettleController.java
@@ -31,22 +31,24 @@
@RequestMapping(value = "/orderSettle/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) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderSettle> wrapper = new EntityWrapper<>();
excludeTrash(param);
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));
+ }
return R.ok(orderSettleService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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)){
+ 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]));
@@ -67,10 +69,10 @@
return R.ok();
}
- @RequestMapping(value = "/orderSettle/update/auth")
- @ManagerAuth
- public R update(OrderSettle orderSettle){
- if (Cools.isEmpty(orderSettle) || null==orderSettle.getOrderSettle()){
+ @RequestMapping(value = "/orderSettle/update/auth")
+ @ManagerAuth
+ public R update(OrderSettle orderSettle) {
+ if (Cools.isEmpty(orderSettle) || null == orderSettle.getOrderSettle()) {
return R.error();
}
orderSettle.setUpdateBy(getUserId());
@@ -81,8 +83,8 @@
@RequestMapping(value = "/orderSettle/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderSettleService.deleteById(id);
}
return R.ok();
@@ -90,7 +92,7 @@
@RequestMapping(value = "/orderSettle/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderSettle> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderSettle"));
@@ -106,10 +108,10 @@
wrapper.like("settle_name", condition);
Page<OrderSettle> page = orderSettleService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderSettle orderSettle : page.getRecords()){
+ for (OrderSettle orderSettle : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderSettle.getOrderSettle());
- map.put("value", orderSettle.getOrderSettle());
+ map.put("value", orderSettle.getSettleName());
result.add(map);
}
return R.ok(result);
@@ -119,7 +121,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderSettle> wrapper = new EntityWrapper<OrderSettle>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderSettleService.selectOne(wrapper)){
+ if (null != orderSettleService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderSettle.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1