修改

jinlin

2023-12-13 b089cb398c59be1aa2c12c6b0be7652a9edb3612

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml

@@ -20,14 +20,14 @@
        SET @row_number = 0;
        SELECT (@row_number := @row_number + 1)                        AS no,
               p.secret_class,
               SUBSTRING(m.name, LOCATE('软件', m.name), LENGTH(m.name)) AS itemName,
               m.identify                                              AS version,
               m.name                                                  AS Item_identify
        FROM software_test_order s
                 JOIN software_test_order_measured m ON s.project_id = ${projectId}
               SUBSTRING(t.name, LOCATE('软件', t.name), LENGTH(t.name)) AS itemName,
               t.identify                                              AS version,
               t.name                                                  AS Item_identify
        FROM item_circulat_order_technical t
                 JOIN item_circulat_order i ON i.project_id = ${projectId}
                 JOIN project p ON p.id = ${projectId}
        WHERE s.is_delete = 0
          AND s.id = m.order_id
        WHERE t.is_delete = 0
          AND i.id = t.circulat_order_id
        UNION
        SELECT (@row_number := @row_number + 1) AS no,
               NULL                             AS secretClass,
@@ -50,15 +50,19 @@
    <select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
        SET @row_number = 0;
        SELECT (@row_number := @row_number + 1) AS no,
               a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id
        a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id
        from config_item_warehouse_detail a
        WHERE a.is_delete = 0
        and a.project_id = ${projectId}
        <if test="ids!=null and ids!=''">
            AND id not in (${ids})
        </if>
        and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail WHERE (SELECT count(*) FROM
        config_item_warehouse_detail WHERE id = select_id) > 0)
        and a.id NOT IN (SELECT '${type}' FROM config_item_warehouse_detail
        WHERE
        ( SELECT count(*) FROM config_item_warehouse_detail WHERE id IN (SELECT
        '${type}'
        FROM
        config_item_warehouse_detail) ) > 0)
    </select>

</mapper>