修改

jinlin

2023-12-07 90647423508515d2ecaab1af33da0ec9bf24dd52

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

@@ -5,16 +5,43 @@

    <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
        select a.*
        from warehouse_config_item a
        from config_item_warehouse_detail a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            <if test="warehouseId!=null">
                and warehouse_id = ${warehouseId}
            </if>
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}
        </if>
    </select>
    <select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
        SELECT 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}
                 JOIN project p ON p.id = ${projectId}
        WHERE s.is_delete = 0
          AND  s.id = m.order_id
        UNION
        SELECT NULL AS secretClass,
               '软件测试委托单' AS itemName,
               NULL AS version,
               s.code AS itemIdentify
        FROM software_test_order s
        WHERE s.is_delete = 0
          AND  s.project_id = ${projectId}
        UNION
        SELECT NULL AS secretClass,
               '物品流转单' AS itemName,
               NULL AS version,
               i.code AS itemIdentify
        FROM item_circulat_order i
        WHERE i.is_delete = 0
          AND  i.project_id = ${projectId}
    </select>

</mapper>