From 308c398b62c2319a78f7d9dae6aea8916da95cab Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 10 二月 2022 10:42:31 +0800
Subject: [PATCH] #table-body-node
---
src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
index bf75dc8..047a228 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.FlowStatus;
import zy.cloud.wms.manager.service.FlowStatusService;
import com.core.annotations.ManagerAuth;
@@ -32,22 +33,24 @@
@RequestMapping(value = "/flowStatus/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<FlowStatus> 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(flowStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper 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]));
@@ -64,10 +67,10 @@
return R.ok();
}
- @RequestMapping(value = "/flowStatus/update/auth")
- @ManagerAuth
- public R update(FlowStatus flowStatus){
- if (Cools.isEmpty(flowStatus) || null==flowStatus.getId()){
+ @RequestMapping(value = "/flowStatus/update/auth")
+ @ManagerAuth
+ public R update(FlowStatus flowStatus) {
+ if (Cools.isEmpty(flowStatus) || null == flowStatus.getId()) {
return R.error();
}
flowStatusService.updateById(flowStatus);
@@ -76,16 +79,17 @@
@RequestMapping(value = "/flowStatus/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- flowStatusService.deleteById(id);
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
+ flowStatusService.delete(new EntityWrapper<FlowStatus>()
+ .eq("id",id));
}
return R.ok();
}
@RequestMapping(value = "/flowStatus/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("flowStatus"));
@@ -101,7 +105,7 @@
wrapper.like("id", condition);
Page<FlowStatus> page = flowStatusService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (FlowStatus flowStatus : page.getRecords()){
+ for (FlowStatus flowStatus : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", flowStatus.getId());
map.put("value", flowStatus.getId());
@@ -114,10 +118,26 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<FlowStatus> wrapper = new EntityWrapper<FlowStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != flowStatusService.selectOne(wrapper)){
+ if (null != flowStatusService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(FlowStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
+ /**
+ * 鍗曞嚮input涔嬪悗寮瑰嚭鐨勯�夋嫨妗�
+ * @return
+ */
+ @RequestMapping("/flowId/auth")
+ public R getAllFlowIds(){
+ List<FlowStatus> flowStatuses = flowStatusService.selectList(null);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (FlowStatus flowStatus : flowStatuses) {
+ Map<String,Object> content = new HashMap<>();
+ content.put("id",flowStatus.getId());
+ content.put("value",flowStatus.getName());
+ result.add(content);
+ }
+ return R.ok(result);
+ }
}
--
Gitblit v1.9.1