From 41411a57fc0d237577aa10ccfc1aded50556f5ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 28 三月 2026 13:35:23 +0800
Subject: [PATCH] Revert "添加的分属环境配置文件 暂停上报功能"
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index e596706..06a42ff 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -10,19 +10,27 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.impl.WrkDetlServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class WrkMastController extends BaseController {
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
@RequestMapping(value = "/wrkMast/{id}/auth")
@ManagerAuth
@@ -36,12 +44,23 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String barcode,
+ @RequestParam(required = false)String orderNo,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkMast.class, param.keySet(), wrapper, condition);
+
+ if (!Cools.isEmpty(orderNo)) {
+ List<WrkDetl> detls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+ if (!Cools.isEmpty(detls)) {
+ List<Integer> wrkNos = detls.stream().map(WrkDetl::getWrkNo).collect(Collectors.toList());
+ wrapper.in("wrk_no", wrkNos);
+ }
+ }
+
if (!Cools.isEmpty(orderByField)){
if (orderByField.endsWith("$")){
orderByField = orderByField.substring(0, orderByField.length()-1);
@@ -53,14 +72,18 @@
return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ 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(), String.valueOf(entry.getValue()));
+ if (entry.getKey().equals("orderNo")){
+ continue;
+ }
+ wrapper.eq(entry.getKey(), val);
}
}
}
@@ -140,14 +163,18 @@
@RequestMapping(value = "/wrkMast/add/pri/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
+ @Transactional(rollbackFor = Exception.class)
public R addPri(@RequestBody List<WrkMast> list) {
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
for (WrkMast entity : list){
entity.setIoPri(entity.getIoPri() + 1);
+ if (!wrkMastService.update(entity, new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()))) {
+ throw new CoolException("浼樺厛绾ф洿鏂板け璐�!");
+ }
}
- wrkMastService.updateBatchById(list);
+// wrkMastService.updateBatchById(list);
return R.ok();
}
--
Gitblit v1.9.1