功能大调整

李林

2024-03-18 0d98e9c2d06c5d8b7b6de5ec433a12713744ae6b

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

@@ -20,24 +20,6 @@
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,entrust_code,sample_code,
        custom,company,code,
        type,appointed_time,laboratory,
        smaple_type,model,sample,
        sample_num,is_leave,leave_num,
        ins_progress,state,remark,
        otc_code,create_user,create_time,
        update_user,update_time
    </sql>

    <select id="addInsOrder">
        insert into ins_order
        (entrust_code,sample_code,custom,company,code,type,laboratory,model,sample,sample_num,is_leave,leave_num,ins_progress,state,remark,otc_code,create_user,create_time,update_user,update_time)
        values
        (#{entrustCode},#{sampleCode},#{custom},#{company},#{code},#{type},#{appointedTime},#{laboratory},#{smapleType},#{model},#{sample},#{sampleNum},#{isLeave},#{leaveNum},#{insProgress},#{state},#{remark},#{otcCode},#{createUser},#{createTime},#{updateUser},#{updateTime})
    </select>

    <resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
        <result property="id" column="id"/>
        <result property="company" column="company"/>
@@ -68,13 +50,6 @@
        <result property="remark" column="remark"/>
    </resultMap>

    <select id="getOrderThing" resultMap="OrderThingDto">
        select *
        from ins_order io
                 left join ins_product ip on ip.ins_order_id = io.id
                 left join ins_product_result ipr on ip.id = ipr.ins_product_id
    </select>

    <select id="selectInsOrderParameter" resultType="com.yuanchu.mom.pojo.InsOrder">
        select *
        from (
@@ -95,6 +70,20 @@
        create_time,
        state
        from ins_order
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
        select *
        from (
        select io.*,isa.id sampleId,isa.sample_code,isa.sample,isa.ins_progress,ir.id report_id,isa.send_time
        from ins_order io
        left join ins_sample isa on io.id = isa.ins_order_id
        left join (select id, ins_order_id, is_ratify
        from ins_report
        where is_ratify = 1) ir on io.id = ir.ins_order_id
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
@@ -121,7 +110,7 @@
        </set>
        <where>
            id=#{id}
        </where>-->
        </where>
    </update>

</mapper>