From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
index 58e02bc..1841ed1 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
@@ -4,11 +4,17 @@
 <mapper namespace="com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao">
 
     <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse">
-        select a.* ,p.*
+        select a.* ,p.software_name,p.code AS projectCode
         from config_item_warehouse a
-        INNER JOIN  project p ON p.id = a.project_id
+        JOIN project p ON p.id = a.project_id
         <where>
             a.is_delete = 0 and p.is_delete = 0
+            <if test="secretClass!=null">
+                and p.secret_class &lt;= #{secretClass}
+            </if>
+            <if test="deptId!=null">
+                and p.biz_dept_id = #{deptId}
+            </if>
             <if test="whereSql!=null">
                 and ${whereSql}
             </if>
@@ -17,14 +23,29 @@
             ORDER BY ${orderBySql}
         </if>
     </select>
-    <select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit">
+    <select id="itemCmList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit">
         SET @row_number = 0;
-        SELECT  dd.dict_label AS examineItem,
+        SELECT dd.dict_label AS examineItem,
         (@row_number := @row_number + 1) AS no
         FROM sys_dict_type dt
-        JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
+        JOIN sys_dict_data dd ON dt.id = dd.dict_type_id
         <where>
-            dd.IS_DELETE = 0
+            dd.is_delete = 0
+            <if test="dictType != null and dictType != ''">
+                and dt.DICT_TYPE = #{dictType}
+            </if>
+        </where>
+        ORDER BY dd.sort
+    </select>
+
+    <select id="itemQaList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit">
+        SET @row_number = 0;
+        SELECT dd.dict_label AS examineItem,
+        (@row_number := @row_number + 1) AS no
+        FROM sys_dict_type dt
+        JOIN sys_dict_data dd ON dt.id = dd.dict_type_id
+        <where>
+            dd.is_delete = 0
             <if test="dictType != null and dictType != ''">
                 and dt.DICT_TYPE = #{dictType}
             </if>

--
Gitblit v1.9.1