From f97266870e6ad8f964f10937e5588b5b5fa222eb Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期六, 21 九月 2024 08:14:38 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 128 +++++++++++++++++++++++++++++++++---------
1 files changed, 100 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 6965127..30e49bd 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -16,10 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class WrkDetlLogController extends BaseController {
@@ -33,27 +30,102 @@
return R.ok(wrkDetlLogService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/wrkDetlLog/list/auth")
+ /**
+ * 鏍规嵁宸ヤ綔涓绘。鏌ョ湅鏄庣粏鏃讹紝宸ヤ綔鍙疯繃婊ゆ槑缁�
+ */
+ @RequestMapping(value = "/wrkDetlLogByMast/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 list1(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Integer wrk_no,
+ @RequestParam String ioTime) {
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
- wrapper.orderBy("appe_time", false);
+ if (!Cools.isEmpty(wrk_no) && wrk_no != 0) {
+ wrapper.eq("wrk_no", wrk_no);
+ }
+ if (!Cools.isEmpty(ioTime)) {
+ wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
}
return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ @RequestMapping(value = "/wrkDetlLog/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) {
+ EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("modi_time", false);
+ }
+ return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ // 12.12鏂板锛屽伐浣滄槑缁嗗巻鍙叉。杩囨护鎵嬪姩鍙栨秷鐨勫伐浣滄槑缁�
+ @RequestMapping(value = "/wrkDetlLogs/list/auth")
+ @ManagerAuth
+ public R listWrkDetlLogs(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ try {
+ Integer wrkNo = null;
+ String orderNo = null;
+ String matnr = null;
+ String specs = null;
+ String zpallet = null;
+ String batch = null;
+ String model = null;
+ Double anfme = null;
+ Date modiTimeStart = null, modiTimeEnd = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ modiTimeStart = DateUtils.convert(dates[0]);
+ modiTimeEnd = DateUtils.convert(dates[1]);
+ } else if (entry.getKey().equals("wrk_no")) {
+ wrkNo = Integer.parseInt(val);
+ } else if (entry.getKey().equals("order_no")) {
+ orderNo = val;
+ } else if (entry.getKey().equals("specs")) {
+ specs = val;
+ } else if (entry.getKey().equals("zpallet")) {
+ zpallet = val;
+ } else if (entry.getKey().equals("batch")) {
+ batch = val;
+ } else if (entry.getKey().equals("anfme")) {
+ anfme = Double.parseDouble(val);
+ } else if (entry.getKey().equals("matnr")) {
+ matnr = val;
+ } else if (entry.getKey().equals("model")) {
+ model = val;
+ }
+ }
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd, curr, limit);
+ Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, model, modiTimeStart, modiTimeEnd));
+ return R.ok(page1);
+ } catch (Exception e) {
+ return R.error("寮傚父" + e);
+ }
+ }
+
+ 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]));
@@ -70,10 +142,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkDetlLog/update/auth")
- @ManagerAuth
- public R update(WrkDetlLog wrkDetlLog){
- if (Cools.isEmpty(wrkDetlLog) || null==wrkDetlLog.getWrkNo()){
+ @RequestMapping(value = "/wrkDetlLog/update/auth")
+ @ManagerAuth
+ public R update(WrkDetlLog wrkDetlLog) {
+ if (Cools.isEmpty(wrkDetlLog) || null == wrkDetlLog.getWrkNo()) {
return R.error();
}
wrkDetlLogService.updateById(wrkDetlLog);
@@ -82,12 +154,12 @@
@RequestMapping(value = "/wrkDetlLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkDetlLog entity : list){
+ for (WrkDetlLog entity : list) {
wrkDetlLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +167,7 @@
@RequestMapping(value = "/wrkDetlLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetlLog"));
@@ -111,7 +183,7 @@
wrapper.like("id", condition);
Page<WrkDetlLog> page = wrkDetlLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetlLog wrkDetlLog : page.getRecords()){
+ for (WrkDetlLog wrkDetlLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkDetlLog.getWrkNo());
map.put("value", wrkDetlLog.getWrkNo());
@@ -124,7 +196,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkDetlLog> wrapper = new EntityWrapper<WrkDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkDetlLogService.selectOne(wrapper)){
+ if (null != wrkDetlLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkDetlLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1