MOM系统-8-11本地test

XiaoRuby

2023-08-11 8936f5f9af4c6e0221b5a49f2c905efd4df58496

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

@@ -10,7 +10,7 @@
    </select>

    <resultMap id="deviceTwoTreeOneMap" type="map">
        <id property="father" column="father"/>
        <id property="name" column="father"/>
        <collection property="children" resultMap="deviceTwoTreeTwoMap" javaType="List"/>
    </resultMap>

@@ -24,14 +24,34 @@
        FROM device d
        WHERE d.state = 1
        AND d.type = #{type}
            <if test="search_class !=null and search_class != ''">
                AND d.`name` like concat('%',#{search_class},'%')
            </if>
    </select>

    <select id="DevicePageList" resultType="Map">
        SELECT * FROM device d
        SELECT d.id, d.`code`, d.`name`, u.`name` keeper, DATE_FORMAT(d.`end_measure`,'%Y-%m-%d') end_measure, d.`device_status`, d.`factory`, r.`name` inspectProject, i.`name` testSample, i.`user_name`
        FROM (device d, `user` u)
                          LEFT JOIN raw_ins_product r
                                    ON d.`id` = r.`device_id`
                 LEFT JOIN raw_inspect i
                           ON r.`raw_inspect_id` = i.`id`
        WHERE r.`test_state` IS NULL
          AND d.`state` = 1
          AND (r.`state` = 1 OR r.`state` IS NULL)
          AND d.`keeper` = u.`id`
          AND d.type = #{type}
        <if test="codeNameModel != null and codeNameModel != ''">
            AND (d.`name` LIKE CONCAT('%',#{codeNameModel},'%') OR d.`code` LIKE CONCAT('%',#{codeNameModel},'%') OR i.`specifications` LIKE CONCAT('%',#{codeNameModel},'%'))
        </if>
        <if test="deviceStatue != null and deviceStatue != ''">
            AND d.`device_status` = #{deviceStatue}
        </if>
        <if test="deviceId != null and deviceId != ''">
            AND d.id = #{deviceId}
        </if>
        <if test="fatherName != null and fatherName != ''">
            AND d.`father` = #{fatherName}
        </if>
    </select>
</mapper>