Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java

@@ -142,6 +142,8 @@ public interface CommonAPI {
      * @return
      */
     List<DictModel> 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]解决分布式下表字典跨库无法查询问题------------
 
 }

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());
+	}
 }

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<NuConfigSu
 
 	 @Autowired
 	 private RabbitMQUtil rabbitMQUtil;
+	 @Autowired
+	 private DictUtils dictUtils;
 	/**
 	 * 分页列表查询
 	 *
@@ -241,6 +244,8 @@ public class NuConfigSuppliersApplyController extends JeecgController<NuConfigSu
 		 String orgCode = nuConfigSuppliersApplyService.audit(nuConfigSuppliersApply);
 		 SuppliersInfoMQDto suppliersInfoMQDto = new SuppliersInfoMQDto();
 		 BeanUtils.copyProperties(nuConfigSuppliersApply, suppliersInfoMQDto);
+		 String text = dictUtils.translateDictText("suppliers_nature",nuConfigSuppliersApply.getSuppliersNature());
+		 suppliersInfoMQDto.setSuppliersNature(text);
 		 suppliersInfoMQDto.setSysOrgCode(orgCode);
 		 rabbitMQUtil.sendToExchange("nu.suppliers.updateAuditResult", "nu.suppliers.updateAuditResult", suppliersInfoMQDto);
 		 return Result.OK("审核成功!");

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -216,4 +216,6 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
     int removeLogicDeleted(@Param("ids")List<String> ids);
 
 	int existColumn(@Param("tableName") String tableName, @Param("columnName") String columnName);
+
+    String translateDictText(@Param("code") String code, @Param("text") String text);
 }

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -266,4 +266,11 @@
         </foreach>
     </delete>
 
+    <!-- 通过字典code获取字典数据 -->
+    <select id="translateDictText" parameterType="String" resultType="String">
+        select s.item_value
+        from sys_dict_item s
+        where s.dict_id = (select id from sys_dict where dict_code = #{code})
+        and s.item_text = #{text}
+    </select>
 </mapper>

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<SysDict> {
 	 */
 	boolean removeLogicDeleted(List<String> ids);
 
+	String translateDictText(String code, String text);
 }

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<DictModel> 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]解决分布式下表字典跨库无法查询问题------------
 
 	//-------------------------------------流程节点发送模板消息-----------------------------------------------

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<SysDictMapper, SysDict> impl
         return line > 0;
     }
 
+    @Override
+    public String translateDictText(String code, String text) {
+        String rettext = baseMapper.translateDictText(code, text);
+        return rettext;
+    }
+
     /**
      * 添加字典
      *