From 020eb6dc7ebe1f5f4518c76af19520f9d1d4e9f6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 19 十一月 2025 14:45:28 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/InOutController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InOutController.java b/src/main/java/com/zy/asrs/controller/InOutController.java
index 9f33e49..4a2af20 100644
--- a/src/main/java/com/zy/asrs/controller/InOutController.java
+++ b/src/main/java/com/zy/asrs/controller/InOutController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
@@ -8,13 +9,16 @@
import com.core.common.R;
import com.zy.asrs.entity.InOut;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.service.InOutService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
@RestController
@@ -56,12 +60,23 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("locNo")) {
- wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+ if (entry.getKey().equals("temp1")) {
+ wrapper.eq("temp1", String.valueOf(entry.getValue()));
} else {
wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
}
}
}
}
+
+ @RequestMapping(value = "/matInOut/export/auth")
+ @ManagerAuth(memo = "鍟嗗搧淇℃伅瀵煎嚭")
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<InOut> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("inOut"));
+ convert(map, wrapper);
+ List<InOut> list = inOutService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
}
--
Gitblit v1.9.1