From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
index 9c64edf..feab17d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
@@ -51,12 +51,12 @@
@Override
public void add(FieldDTO dto) {
//参数校验
- Integer fieldType = dto.getFieldType();
+ FieldTypeEnum fieldType = dto.getFieldType();
//1:数字 2:文本 3:百分比
- if (FieldTypeEnum.TEXT.getCode().equals(fieldType)) {
+ if (FieldTypeEnum.TEXT.equals(fieldType)) {
if (StringUtils.isNull(dto.getTextInputType())) {
throw new ServiceException("输入类型不能为空");
- } else if (FieldInputTypeEnum.FIXED_CONTENT.getCode().equals(dto.getTextInputType()) && StringUtils.isBlank(dto.getTextContent())) {
+ } else if (FieldInputTypeEnum.FIXED_CONTENT.equals(dto.getTextInputType()) && StringUtils.isBlank(dto.getTextContent())) {
throw new ServiceException("内容设置不能为空");
}
}
@@ -90,7 +90,7 @@
log.info("======子线程执行handleDataConfig{}",Thread.currentThread().getName() );
List<TbBasicDataConfig> list = tbBasicDataConfigService.lambdaQuery().eq(TbBasicDataConfig::getStatus, ShowStatusEnum.SHOW.getCode()).list();
if (CollUtils.isNotEmpty(list)) {
- List<Integer> ids = list.stream().map(config -> {
+ List<Long> ids = list.stream().map(config -> {
String fieldIdStr = config.getFieldIdStr();
String[] split = fieldIdStr.split(",");
//字符串数组转为List
@@ -122,7 +122,7 @@
}
@Override
- public String influencedData(Integer id) {
+ public String influencedData(Long id) {
List<TbBasicDataConfig> list = tbBasicDataConfigService.lambdaQuery().eq(TbBasicDataConfig::getStatus, ShowStatusEnum.SHOW).list();
if (CollUtils.isEmpty(list)) {
return "";
--
Gitblit v1.7.1