From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:16:18 +0800
Subject: [PATCH] art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java
index f9d398c..7243625 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.mdc.dto.OptionsDto;
@@ -26,7 +27,7 @@
*/
@Override
public List<MdcDriveTypeParamConfig> getShowDriveParam(String driveType) {
- return lambdaQuery().eq(MdcDriveTypeParamConfig::getControlSystemType, driveType).eq(MdcDriveTypeParamConfig::getShowFlag, CommonConstant.YN_Y).list();
+ return lambdaQuery().eq(MdcDriveTypeParamConfig::getControlSystemType, driveType).eq(MdcDriveTypeParamConfig::getShowFlag, CommonConstant.YN_Y).orderByAsc(MdcDriveTypeParamConfig::getSortNo).list();
}
/**
@@ -59,4 +60,22 @@
}
return result;
}
+
+ /**
+ * 鏍规嵁鎺у埗绯荤粺绫诲瀷鑾峰彇鍙傛暟
+ */
+ @Override
+ public List<OptionsDto> getDriveParamOptionsByType(String controlSystemType) {
+ List<OptionsDto> result = new ArrayList<>();
+ List<MdcDriveTypeParamConfig> mdcDriveTypeParamConfigList = super.list(new LambdaQueryWrapper<MdcDriveTypeParamConfig>().eq(MdcDriveTypeParamConfig::getControlSystemType, controlSystemType).eq(MdcDriveTypeParamConfig::getCurveGenerationFlags, CommonConstant.YN_Y));
+ if (mdcDriveTypeParamConfigList != null && !mdcDriveTypeParamConfigList.isEmpty()) {
+ for (MdcDriveTypeParamConfig mdcDriveTypeParamConfig : mdcDriveTypeParamConfigList) {
+ OptionsDto optionsDto = new OptionsDto();
+ optionsDto.setLabel(mdcDriveTypeParamConfig.getEnglishName() + "(" + mdcDriveTypeParamConfig.getChineseName() + ")");
+ optionsDto.setValue(mdcDriveTypeParamConfig.getEnglishName() + "(" + mdcDriveTypeParamConfig.getChineseName() + ")");
+ result.add(optionsDto);
+ }
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3