From 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:41:41 +0800
Subject: [PATCH] 1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
index 89bacbf..40fe54f 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
@@ -99,12 +99,18 @@
<!-- 閲嶅鏍￠獙 sql璇彞 -->
<select id="duplicateCheckCountSql" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
- SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id <> #{dataId}
+ SELECT COUNT(1) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id <> #{dataId}
+ <if test="delFlag != null and delFlag ">
+ and del_flag=0
+ </if>
</select>
<!-- 閲嶅鏍￠獙 sql璇彞 -->
<select id="duplicateCheckCountSqlNoDataId" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
- SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
+ SELECT COUNT(1) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
+ <if test="delFlag != null and delFlag ">
+ and del_flag=0
+ </if>
</select>
<!-- 鏌ヨ閮ㄩ棬淇℃伅 浣滀负瀛楀吀鏁版嵁 -->
@@ -224,5 +230,12 @@
</foreach>
</select>
+ <!-- 閫氳繃瀛楀吀code,itemText鑾峰彇itemValue -->
+ <select id="queryDictItemValueByCodeAndText" parameterType="String" resultType="org.jeecg.common.system.vo.DictModel">
+ select s.item_value as "value",s.item_text as "text" from sys_dict_item s
+ where dict_id = (select id from sys_dict where dict_code = #{code})
+ and s.item_text = #{itemText}
+ order by s.sort_order asc
+ </select>
</mapper>
--
Gitblit v1.9.3