From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 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 38d011c..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,12 +1,15 @@
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;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.mapper.MdcDriveTypeParamConfigMapper;
import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -24,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();
}
/**
@@ -39,4 +42,40 @@
public List<MdcDriveTypeParamConfig> getByTypeCodeMdcShowCode(String codeTypeId) {
return this.baseMapper.selectBatchIds(Arrays.asList(codeTypeId.split(",")));
}
+
+ /**
+ * 鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」
+ */
+ @Override
+ public List<OptionsDto> getDriveParamOptions() {
+ List<OptionsDto> result = new ArrayList<>();
+ List<String> driveParams = this.baseMapper.getDriveParamOptions();
+ if (driveParams != null && !driveParams.isEmpty()) {
+ for (String driveParam : driveParams) {
+ OptionsDto optionsDto = new OptionsDto();
+ optionsDto.setLabel(driveParam);
+ optionsDto.setValue(driveParam);
+ result.add(optionsDto);
+ }
+ }
+ 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