From 0cdf3e50751dee9c76fec7ca4a9b9be0d967da68 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 04 六月 2024 08:40:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaController.java | 3 ++-
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index b449dca..156da25 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -362,7 +362,8 @@
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Pla> wrapper = new EntityWrapper<Pla>().setSqlSelect("batch")
.andNew().like("batch", condition)
- .groupBy("batch");
+ .groupBy("batch")
+ .orderBy("batch",false);
List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
for (Pla pla : plas) {
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index 781f919..9f46630 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -87,7 +87,7 @@
// throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
// }
total++;
- }else if(Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_00)){
+ }else if(Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_00) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) ){
excel.setId(pla.getId());
excel.setCreateTime(pla.getCreateTime());
excel.setStatus(pla.getStatus());
--
Gitblit v1.9.1