Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-01-22 99bfa55e580535304111fd4dce5c48c850bbecce

 north-glass-erp/src/main/resources/mapper/sd/Product.xml

@@ -3,42 +3,24 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">

<resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
    <id column="id" property="id"/>
    <result column="product" property="product"/>
    <result column="total_thickness" property="totalThickness"/>
    <result column="thickness" property="thickness"/>
    <result column="query" property="query"/>
    <result column="remarks" property="remarks"/>
    <result column="state" property="state"/>
    <result column="creator" property="creator"/>
    <result column="create_time" property="createTime"/>
    <result column="update_time" property="updateTime"/>
    <association property="glassTypes" javaType="com.example.erp.entity.sd.GlassType">
        <result column="type_id" property="typeId"/>
        <result column="type_name" property="typeName"/>
    </association>
    <!--<result column="g_typeId" property="glassTypes.typeId"/>
    <result column="g_type" property="glassTypes.type"/>-->

</resultMap>

    <select id="defaultProduct" resultMap="productmap">
        select a.id                as id,
               a.product,
               a.total_thickness,
               a.thickness,
               a.query,
               a.remarks,
               a.state,
               a.creator,
               date(a.create_time) as create_time,
               a.update_time       as update_time,
               bgt.type_id         as type_id,
               bgt.type            as type
        from product as a
                 left join glass_type bgt on bgt.type_id = a.type_id
    <select id="defaultProduct">
        select
            a.id,
            prodID,
            product,
            glassType,
            typeName,
            totalThickness,
            thickness,
            Query,
            remarks,
            state,
            creator,
            date(a.createTime) as 'createTime',
            updateTime
        from
            product as a
        left join basic_glass_type bgt on bgt.typeID = a.glassType

        order by id desc
        limit #{offset},#{pageSize}