From 672c8317bb13928d7eb79ac4911302eb4cbcf961 Mon Sep 17 00:00:00 2001
From: yb <1113799@qq.com>
Date: 星期四, 11 九月 2025 11:32:04 +0800
Subject: [PATCH] 倍率统计报表
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentMagnificationServiceImpl.java | 4 +---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
index 39b9f53..4ed9285 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentMagnificationController.java
@@ -75,10 +75,10 @@
@AutoLog(value = "鍊嶇巼鎶ヨ〃")
@ApiOperation(value = "鍊嶇巼鎶ヨ〃", notes = "鍊嶇巼鎶ヨ〃")
@RequestMapping(value = "/beilvList")
- public MdcMagnificationVo beilvList(MdcEquipmentMagnificationVo magnificationVo) {
+ public Result<?> beilvList(MdcEquipmentMagnificationVo magnificationVo) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
MdcMagnificationVo vo = service.beilvsList(magnificationVo,userId);
- return vo;
+ return Result.OK(vo);
}
}
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 0debec7..6bcafdd 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
@@ -63,7 +63,7 @@
/* Equipment e = equipmentService.getById("12345678");
List<Equipment> equipmentList = new ArrayList<>();
equipmentList.add(e);*/
- if (org.apache.commons.lang.StringUtils.isNotBlank(dateTime)) {
+ if (StringUtils.isNotBlank(dateTime)) {
try {
Date initDate = DateUtils.toDate(dateTime, "yyyyMMdd");
String date = DateUtils.format(initDate,DateUtils.STR_DATE);
@@ -127,8 +127,6 @@
if (!magnifications.isEmpty() && magnifications.size() > 0) {
saveBatch(magnifications);
}
- //鏁版嵁淇濆瓨
- return;
}
@Override
--
Gitblit v1.9.3