Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-22 08cad817f057c4a10e1ea59e362fbb492f3381df

 cnas-server/src/main/resources/mapper/DeviceMapper.xml

@@ -35,7 +35,8 @@
        create_user,
        create_time,
        update_user,
        update_time
        update_time,
        status
        from device
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -45,10 +46,11 @@
    <select id="selectEquipmentOverview" resultType="com.yuanchu.mom.pojo.Device">
        select * from(
        select id,
        deviceName,
        specificationModel,
        deviceStatus,
        device_name,
        specification_model,
        device_status,
        create_user,
        status,
        update_time
        from device
        ) a
@@ -56,4 +58,49 @@
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
        select id,
               authorized_person
        from device
    </select>
    <select id="search" resultType="com.yuanchu.mom.pojo.Device">
        select *
        from device
        <where>
            <if test="deviceName!=null and deviceName!=''">
                and device_name like concat('%',#{deviceName},'%')
            </if>
            <if test="specificationModel!=null and specificationModel!= ''">
                and specification_model = #{specificationModel}
            </if>
            <if test="largeCategory!=null and largeCategory!= ''">
                and large_category = #{largeCategory}
            </if>
        </where>
    </select>

    <select id="selectDeviceImage" resultType="com.yuanchu.mom.pojo.Device">
        select (image_upload, create_user, create_time) values (#{image_upload}
             , #{createUser}
             , #{createTime})
    </select>
    <select id="selectDevicePrincipal" resultType="com.yuanchu.mom.pojo.Device">
        select id,
               equipment_manager
        from device
    </select>

    <select id="selectDeviceParameterPage" resultType="com.yuanchu.mom.dto.DeviceDto">
        select * from(
        SELECT
        d.*, u.name equipmentManagerUser, l.laboratory_name laboratoryName
        FROM
        device d
        left join `user` u on u.id = d.equipment_manager
        left join laboratory l on l.id = d.subordinate_departments_id
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>