diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java index e087a61e..d2983290 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java @@ -142,6 +142,8 @@ public interface CommonAPI { * @return */ List translateDictFromTableByKeys(String table, String text, String code, String keys, String dataSource); + + String translateDictText(String code, String trim); //update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ } diff --git a/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java b/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java index d8a07d47..78e04958 100644 --- a/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java +++ b/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java @@ -172,4 +172,15 @@ public class DictUtils { return textValue.toString(); } } + + + /** + * 获取字典的值 + * @param code 字典编码 + * @param text 字典的文本 + * @return 字典的值 + */ + public String translateDictText(String code, String text) { + return this.commonAPI.translateDictText(code, text.trim()); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java index 57421a31..72b9c55d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/controller/NuConfigSuppliersApplyController.java @@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse; import com.nu.dto.SuppliersInfoMQDto; import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo; import com.nu.modules.configSuppliersInfo.service.IConfigSuppliersInfoService; +import com.nu.utils.DictUtils; import com.nu.utils.RabbitMQUtil; import io.netty.util.internal.StringUtil; import org.apache.commons.lang.StringUtils; @@ -66,6 +67,8 @@ public class NuConfigSuppliersApplyController extends JeecgController { int removeLogicDeleted(@Param("ids")List ids); int existColumn(@Param("tableName") String tableName, @Param("columnName") String columnName); + + String translateDictText(@Param("code") String code, @Param("text") String text); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index cf102715..93ff5f98 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -266,4 +266,11 @@ + + diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java index b14cc66d..0618e94a 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java @@ -301,4 +301,5 @@ public interface ISysDictService extends IService { */ boolean removeLogicDeleted(List ids); + String translateDictText(String code, String text); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 63e854d2..55581609 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -1553,6 +1553,11 @@ public class SysBaseApiImpl implements ISysBaseAPI { public List translateDictFromTableByKeys(String table, String text, String code, String keys, String dataSource) { return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(",")), dataSource); } + + @Override + public String translateDictText(String code, String text) { + return sysDictService.translateDictText(code, text); + } //update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------ //-------------------------------------流程节点发送模板消息----------------------------------------------- diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java index 5504ee2b..9532a96a 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.system.service.impl; import cn.hutool.core.util.RandomUtil; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -897,6 +898,12 @@ public class SysDictServiceImpl extends ServiceImpl impl return line > 0; } + @Override + public String translateDictText(String code, String text) { + String rettext = baseMapper.translateDictText(code, text); + return rettext; + } + /** * 添加字典 *