Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-04 6db5272e2df8a27942f10c03d93183fc9b01e22a

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

@@ -44,32 +44,67 @@
        order by ru.id desc
    </select>
    <select id="selectInsList" resultType="java.util.Map">
        select ru.id,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') '来料日期',
        SELECT ru.id,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
        reason,
        material_code,
        name,
        project_name,
        u.`name`,
        specifications_model,
        unit,
        quantity,
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') '报检日期',
        DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
        u.name,
        DATE_FORMAT(fi.update_time, '%Y-%m-%d') '检验日期',
        deal_state,
        deal_reasult,
        DATE_FORMAT(deal_time, '%Y-%m-%d') '处理日期'
        from mom_ocean.inspect_unaccepted ru,
        mom_ocean.finished_inspect fi ,
        mom_ocean.user u
        DATE_FORMAT(deal_time, '%Y-%m-%d') processingDate
        FROM (inspect_unaccepted ru,
        `user` u)
        LEFT JOIN finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
        where fi.id = ru.raw_inspect_id
        and fi.user_id=u.id
        AND ru.type = 1
        AND ru.state=1
        AND fi.`user_id` = u.`id`
        <if test="dealState!=null and dealState!=''">
            and deal_state=#{dealState}
        </if>
        <if test="formTime!=null and formTime!=''">
            and fi.create_time=#{formTime}
        </if>
        and ru.state=1
        order by ru.id desc
    </select>
</mapper>

    <select id="selectUnqualifiedRawMaterials" resultType="map">
        SELECT i.id,
               DATE_FORMAT(r.create_time, '%Y-%m-%d') dateArrival,
               i.`reason`,
               r.`code`,
               r.`name`,
               r.`specifications`,
               r.`unit`,
               r.`number`,
               DATE_FORMAT(r.`create_time`,'%Y-%m-%d') inspectionDate,
               r.`user_name`,
               DATE_FORMAT(r.`ins_time`,'%Y-%m-%d') processingDate,
               r.`supplier`,
               i.`deal_state`,
               i.`deal_reasult`
        FROM inspect_unaccepted i
                 LEFT JOIN raw_inspect r ON i.`raw_inspect_id` = r.`id`
        WHERE i.`state` = 1
          AND i.`type` = 0
        <if test="formTime != null and formTime != ''">
            AND r.create_time = #{formTime}
        </if>
        <if test="productName != null and productName != ''">
            AND r.name LIKE CONCAT('%', #{productName}, '%')
        </if>
        <if test="supplier != null and supplier != ''">
            AND r.supplier LIKE CONCAT('%', #{supplier}, '%')
        </if>
        <if test="processingStatus != null">
            AND i.deal_state = #{processingStatus}
        </if>
        ORDER BY i.`id` DESC
    </select>
</mapper>