Merge remote-tracking branch 'origin/master'

zss

2024-05-31 781f2999683ca99577026df7ef4b748bf6366dac

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

@@ -14,5 +14,85 @@
        <result column="update_user" property="updateUser" />
        <result column="update_time" property="updateTime" />
    </resultMap>
    <select id="selectFibersByBushingId" resultMap="FibersDto">
        select
            fs.id, fs.code, fs.model, fs.standard, fs.num, fs.ins_bushing_id,
            p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
        from ins_fibers fs
        left join ins_product p on p.ins_fibers_id = fs.id
        where fs.ins_bushing_id = #{bushingId}
    </select>

    <select id="selectFiberByBushingId" resultMap="FiberDto">
        select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
            p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
        from ins_fiber f
        left join ins_product p on p.ins_fiber_id = f.id
        where f.ins_bushing_id = #{bushingId}
    </select>

    <select id="selectFiberByFibersId" resultMap="FiberDto">
        select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
               p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s
        from ins_fiber f
        left join ins_product p on p.ins_fiber_id = f.id
        where f.ins_fibers_id = #{fibersId}
    </select>

    <resultMap id="FibersDto" type="com.yuanchu.mom.dto.FibersDto">
        <id property="id" column="id"/>
        <result property="code" column="code"/>
        <result property="insBushingId" column="ins_bushing_id"/>
        <result property="model" column="model"/>
        <result property="standard" column="standard"/>
        <result property="num" column="num"/>
        <collection property="productList" resultMap="product"/>
    </resultMap>

    <resultMap id="FiberDto" type="com.yuanchu.mom.dto.FiberDto">
        <id property="id" column="id"/>
        <result property="bushColor" column="bush_color"/>
        <result property="insBushingId" column="ins_bushing_id"/>
        <result property="model" column="model"/>
        <result property="standard" column="standard"/>
        <result property="color" column="color"/>
        <collection property="productList" resultMap="product"/>
    </resultMap>

    <resultMap id="product" type="com.yuanchu.mom.pojo.InsProduct">
        <id property="id" column="pid" jdbcType="INTEGER"/>
        <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
        <result property="factory" column="factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="pmodel" jdbcType="VARCHAR"/>
        <result property="sonLaboratory" column="son_laboratory" jdbcType="VARCHAR"/>
        <result property="unit" column="unit" jdbcType="VARCHAR"/>
        <result property="price" column="price" jdbcType="DECIMAL"/>
        <result property="manHour" column="man_hour" jdbcType="DOUBLE"/>
        <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
        <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
        <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
        <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
        <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
        <result property="section" column="section" jdbcType="VARCHAR"/>
        <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
        <result property="method" column="method" jdbcType="VARCHAR"/>
        <result property="manDay" column="man_day" jdbcType="INTEGER"/>
        <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
        <result property="ask" column="ask" jdbcType="VARCHAR"/>
        <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
        <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="templateId" column="template_id" jdbcType="INTEGER"/>
    </resultMap>

</mapper>