From 1286f6fd5625d3d058d1dcff11b8fda303d6c455 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 10:28:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
index 7a4b06b..357a72f 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-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.core.common.DateUtils;
-import com.zy.asrs.entity.WrkMastDetlLog;
-import com.zy.asrs.service.WrkMastDetlLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.WrkMastDetlLog;
+import com.zy.asrs.service.WrkMastDetlLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class WrkMastDetlLogController extends BaseController {
@@ -32,30 +34,59 @@
@RequestMapping(value = "/wrkMastDetlLog/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(required = false)String condition,
- @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(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(WrkMastDetlLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
wrapper.orderBy("io_time", false);
- return R.ok(wrkMastDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<WrkMastDetlLog> wrkMastDetlLogPage = wrkMastDetlLogService.selectPage(new Page<>(curr, limit), wrapper);
+ List<WrkMastDetlLog> records = wrkMastDetlLogPage.getRecords();
+ HashMap<String, Double> count = new HashMap<>();
+ for (WrkMastDetlLog record : records) {
+ String ioType = record.getIoType$();
+ if (!Cools.isEmpty(ioType) && !"null".equalsIgnoreCase(ioType)) {
+ if (!"53.鎷ｆ枡鍐嶅叆搴�".equalsIgnoreCase(ioType)) {
+ if ("103.鎷ｆ枡鍑哄簱".equalsIgnoreCase(ioType)) {
+ ioType = "101.鍑哄簱";
+ }
+ String[] split = ioType.split("\\.");
+ Double l = count.get(split[1]);
+ if (l == null) {
+ count.put(split[1], record.getAnfme());
+ } else {
+ count.put(split[1], l + record.getAnfme());
+ }
+ }
+ }
+ }
+ R ok = R.ok(wrkMastDetlLogPage);
+ ok.put("count", count);
+ return ok;
}
- 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]));
} else {
- wrapper.like(entry.getKey(), val);
+ if (entry.getKey().equals("io_type")) {
+ wrapper.eq(entry.getKey(), val);
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+
}
}
}
@@ -67,11 +98,11 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMastDetlLog/update/auth")
- @ManagerAuth
- public R update(WrkMastDetlLog wrkMastDetlLog){
- if (Cools.isEmpty(wrkMastDetlLog)){
- return R.error();
+ @RequestMapping(value = "/wrkMastDetlLog/update/auth")
+ @ManagerAuth
+ public R update(WrkMastDetlLog wrkMastDetlLog) {
+ if (Cools.isEmpty(wrkMastDetlLog)) {
+ return R.error("鍙傛暟缂哄け");
}
wrkMastDetlLogService.updateById(wrkMastDetlLog);
return R.ok();
@@ -79,16 +110,16 @@
@RequestMapping(value = "/wrkMastDetlLog/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) {
wrkMastDetlLogService.deleteById(id);
}
return R.ok();
}
@RequestMapping(value = "/wrkMastDetlLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｆ槑缁嗗鍑�")
+ public synchronized R export(@RequestBody JSONObject param) {
EntityWrapper<WrkMastDetlLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastDetlLog"));
@@ -105,7 +136,7 @@
wrapper.like("id", condition);
Page<WrkMastDetlLog> page = wrkMastDetlLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastDetlLog wrkMastDetlLog : page.getRecords()){
+ for (WrkMastDetlLog wrkMastDetlLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMastDetlLog.getWrkNo());
map.put("value", wrkMastDetlLog.getWrkNo());
@@ -118,7 +149,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkMastDetlLog> wrapper = new EntityWrapper<WrkMastDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastDetlLogService.selectOne(wrapper)){
+ if (null != wrkMastDetlLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMastDetlLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1