From 88c6a0e35a1edc37872fb11725c229124b037c43 Mon Sep 17 00:00:00 2001
From: yb <1113799@qq.com>
Date: 星期五, 05 九月 2025 13:19:16 +0800
Subject: [PATCH] 倍率统计导出bug调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java | 10 ++++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java | 3 +--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java
index 9523e34..b24447d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java
@@ -20,8 +20,7 @@
private BigDecimal feedbeilv = new BigDecimal(0);
//鏈夋晥鏃ユ湡
@ApiModelProperty(value = "鏃ユ湡")
- @Excel(name = "鏃ユ湡", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @Excel(name = "鏃ユ湡", width = 15)
private String theDate;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml
index 7034af5..c6d5a8b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMagnificationMapper.xml
@@ -27,7 +27,7 @@
#{ id }
</foreach>
</if>
- ORDER BY t1.the_date ASC
+ ORDER BY t1.the_date,t1.equipment_id ASC
</select>
@@ -53,6 +53,6 @@
#{ id }
</foreach>
</if>
- ORDER BY t1.the_date ASC
+ ORDER BY t1.the_date,t1.equipment_id ASC
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java
index a2ade91..0924883 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java
@@ -7,11 +7,13 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcEquipmentMagnificationDto;
-import org.jeecg.modules.mdc.entity.*;
+import org.jeecg.modules.mdc.entity.Equipment;
+import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
+import org.jeecg.modules.mdc.entity.MdcEquipmentMagnification;
+import org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection;
import org.jeecg.modules.mdc.mapper.MdcEquipmentMagnificationMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
-import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -56,10 +58,10 @@
if (mdcMagnification == null) {
start = DateUtils.plusTime(DateUtils.getNow(), -5);
} else {
+ start = DateUtils.toDate(mdcMagnification.getTheDate(),DateUtils.STR_DATE );
if (now.toString().equals(start.toString())) {
continue;
}
- start = DateUtils.toDate(mdcMagnification.getTheDate(),DateUtils.STR_DATE );
}
List<String> dates = DateUtils.getDatesStringList(start,now);
List<MdcDriveTypeParamConfig> list = new ArrayList<>();
@@ -171,7 +173,7 @@
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
// 瀵煎嚭鏂囦欢鍚嶇О
mv.addObject(NormalExcelConstants.FILE_NAME, "鍊嶇巼鎶ヨ〃");
- mv.addObject(NormalExcelConstants.CLASS, MdcDownTime.class);
+ mv.addObject(NormalExcelConstants.CLASS, MdcEquipmentMagnificationDto.class);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鍊嶇巼鎶ヨ〃", "瀵煎嚭浜�:" + user.getRealname(), "鍊嶇巼鎶ヨ〃"));
mv.addObject(NormalExcelConstants.DATA_LIST, magnificationDtos);
--
Gitblit v1.9.3