From a776be69bcd141d2c85e9cb25174c2959cb2f7aa Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 11 十二月 2024 14:53:46 +0800
Subject: [PATCH] 计划非计划停机管理导入导出功能调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java | 3 ++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java
index 3c8d8cf..846332b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java
@@ -41,7 +41,7 @@
/**
* 璁″垝鍋滄満绫诲瀷
*/
- @Excel(name = "璁″垝鍋滄満绫诲瀷", width = 15)
+ @Excel(name = "鍋滄満绫诲瀷", width = 15)
@ApiModelProperty(value = "璁″垝鍋滄満绫诲瀷")
private String planCloseType;
/**
@@ -53,6 +53,7 @@
/**
* 鍋滄満绫诲瀷(1:璁″垝,2:闈炶鍒�)
*/
+ @Excel(name = "鏄惁璁″垝", width = 15, replace = {"璁″垝_1", "闈炶鍒抇2"})
@ApiModelProperty(value = "鍋滄満绫诲瀷(1:璁″垝,2:闈炶鍒�)")
private String closeType;
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
index b1a67b4..e678fbc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
@@ -151,6 +151,7 @@
if (StringUtils.isNotEmpty(mdcPlanClose.getStartTime()) && StringUtils.isNotEmpty(mdcPlanClose.getEndTime())) {
queryWrapper.between(MdcPlanClose::getTheDate, mdcPlanClose.getStartTime(), mdcPlanClose.getEndTime());
}
+ queryWrapper.eq(MdcPlanClose::getCloseType, mdcPlanClose.getCloseType());
queryWrapper.orderByDesc(MdcPlanClose::getTheDate).orderByDesc(MdcPlanClose::getEquipmentId);
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<MdcPlanClose> mdcPlanCloses = this.baseMapper.selectList(queryWrapper);
--
Gitblit v1.9.3