Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-11 3594a911312b92561b08c478ef0319cf1ae2b0d8

 inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml

@@ -35,7 +35,7 @@
        order by ru.id desc
    </select>

    <!--原材料不合格-->
    <!--原材料不合格品-->
    <select id="selectUnqualifiedRawMaterials" resultType="map">
        SELECT i.id,
               DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
@@ -73,7 +73,7 @@
    <!--不合格处置-->
    <select id="selectDisposal" resultType="map">
        SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
        o.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
        i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
        FROM inspect_unaccepted i
        LEFT JOIN
        (
@@ -112,8 +112,8 @@
                AND p.`material` LIKE CONCAT('%', #{productName}, '%')
            </if>
         )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
        LEFT JOIN opinion o ON i.`id` = o.`raw_unaccepted_id`
        WHERE i.`state` = 1
          AND i.`deal_reasult` = 0
        <if test="state != null">
            AND i.`deal_state` = #{state}
        </if>