From a3eb8b1a4f9fc1e28fcbf38024cdefb5b60dbdee Mon Sep 17 00:00:00 2001
From: yb <1113799@qq.com>
Date: 星期四, 11 九月 2025 16:41:39 +0800
Subject: [PATCH] 倍率统计报表
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index ee12d77..b7969c3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -111,6 +111,9 @@
@Transactional(rollbackFor = Exception.class)
public void saveMdcEquipment(MdcEquipment mdcEquipment, String selectedDeparts, String selectedProduction) {
//step.1 淇濆瓨璁惧
+ if (StringUtils.isBlank(mdcEquipment.getAttribute())) {
+ mdcEquipment.setAttribute("0");
+ }
this.save(mdcEquipment);
//step.2 淇濆瓨鎵�灞為儴闂�
if (oConvertUtils.isNotEmpty(selectedDeparts)) {
@@ -749,12 +752,40 @@
if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
}
+ if (StringUtils.isNotBlank(vo.getAttribute())) {
+ queryWrapper.eq(MdcEquipment::getAttribute, vo.getAttribute());
+ }
List<MdcEquipment> list = super.list(queryWrapper);
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
}
@Override
+ public List<String> listEquipmentMagnificationId(MdcEquipmentMagnificationVo vo) {
+ LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) {
+ queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
+ }
+ if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
+ queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
+ queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDriveType())) {
+ queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
+ }
+ if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
+ queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
+ }
+ if (StringUtils.isNotBlank(vo.getAttribute())) {
+ queryWrapper.eq(MdcEquipment::getAttribute, vo.getAttribute());
+ }
+ List<MdcEquipment> list = super.list(queryWrapper);
+ return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
+ }
+
+ @Override
public IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req) {
if (StringUtils.isNotBlank(mdcEquipment.getProductionName())) {
// 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
--
Gitblit v1.9.3