修改3.0 9.25

zss

2023-09-25 a3f47b5e065878e5f41699ac1c597fd9ac9c4a21

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

@@ -1,92 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
    <!--不合格管理-->
    <select id="selectInsList" resultType="java.util.Map">
        SELECT ru.id,
        ru.reason,
        u.`name`,
        ru.deal_state,
        ru.deal_reasult,
        DATE_FORMAT(fi.dateArrival, '%Y-%m-%d') dateArrival,
        fi.material_code,
        fi.project_name,
        fi.specifications_model,
        fi.unit,
        number quantity,
        DATE_FORMAT(fi.inspectionDate, '%Y-%m-%d') inspectionDate,
        DATE_FORMAT(fi.processingDate, '%Y-%m-%d') processingDate
        FROM mom_ocean.inspect_unaccepted ru, mom_ocean.`user` u, (
        SELECT p.id, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') dateArrival, p.`material_code`, p.`material` project_name,
        p.`specifications_model`,
        p.`unit`, p.`quantity`,DATE_FORMAT(p.`create_time`, '%Y-%m-%d') inspectionDate, DATE_FORMAT(p.`update_time`,
        '%Y-%m-%d') processingDate, p.`user_id`, 2 AS
        classify
        FROM mom_ocean.process_inspect p
        WHERE p.`state` = 1
        UNION ALL
        SELECT fi.id, DATE_FORMAT(fi.create_time, '%Y-%m-%d')
        dateArrival,material_code, material project_name,specifications_model,
        unit,quantity,DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,DATE_FORMAT(fi.update_time, '%Y-%m-%d')
        processingDate, fi.`user_id`, 1 AS classify
        FROM mom_ocean.finished_inspect fi
        WHERE fi.`state` = 1) fi
        WHERE fi.id = ru.raw_inspect_id
        AND ru.`type` = fi.`classify`
        AND ru.type != 0
        AND ru.state=1
        AND fi.`user_id` = u.`id`
        <if test="dealState!=null">
            and ru.deal_state = #{dealState}
        </if>
        <if test="formTime!=null and formTime!=''">
            and fi.dateArrival=#{formTime}
        </if>
        <if test="productCategories != null">
            and ru.`type` = #{productCategories}
        </if>
        order by ru.id desc
    </select>

    <!--原材料不合格品-->
    <select id="selectUnqualifiedRawMaterials" resultType="map">
        SELECT i.id,
        DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
        i.`reason`,
        r.`code`,
        r.`name`,
        r.`specifications`,
        r.`unit`,
        i.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 mom_ocean.inspect_unaccepted i
        LEFT JOIN mom_ocean.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.form_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>

    <!--不合格处置-->
    <select id="selectDisposal" resultType="map">
        SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, i.number, i.`tell` description,
        i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way, i.faulty_materials, i.opinion_tell
        i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way,
        i.faulty_materials, i.opinion_tell,faulty_materials,reason
        FROM mom_ocean.inspect_unaccepted i
        LEFT JOIN
        (
@@ -130,7 +49,6 @@
        </if>
        )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
        WHERE i.`state` = 1
        AND i.`deal_reasult` = 0
        <if test="state != null">
            AND i.`deal_state` = #{state}
        </if>
@@ -138,33 +56,5 @@
            AND s.`type` = #{productCategories}
        </if>
        ORDER BY i.`update_time` DESC
    </select>

    <resultMap id="editDisposalOpinionConfirmationMap" type="com.yuanchu.mom.pojo.vo.RawInspectVo">
        <id property="code" column="code"/>
        <result property="unit" column="unit"/>
        <result property="name" column="name"/>
        <result property="specifications" column="specifications"/>
        <result property="formTime" column="form_time"/>
        <result property="number" column="number"/>
        <result property="supplier" column="supplier"/>
        <result property="userName" column="user_name"/>
        <collection property="rawInsProducts" ofType="com.yuanchu.mom.pojo.vo.RawInsProductVo">
            <result property="name" column="pNmae"/>
            <result property="unit" column="pUnit"/>
            <result property="required" column="required"/>
            <result property="deviceId" column="device_id"/>
            <result property="internal" column="internal"/>
            <result property="testValue" column="test_value"/>
        </collection>
    </resultMap>

    <select id="editDisposalOpinionConfirmation" resultMap="editDisposalOpinionConfirmationMap">
        select r.`form_time`, r.`specifications`, r.`code`, r.`name`, r.`unit`, r.`number`, r.`supplier`, r.`user_name`, p.`name` pNmae, p.`unit` pUnit,
               p.`required`,p.`internal`, p.`test_value`, p.`device_id`
        from (mom_ocean.inspect_unaccepted i, mom_ocean.raw_inspect r)
                 left join mom_ocean.raw_ins_product p on r.`id` = p.`raw_inspect_id`
        where i.`id` = #{rawUnacceptedId}
          and i.`raw_inspect_id` = r.`id`
    </select>
</mapper>