Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

longyvfengyun

2022-07-28 b6c1658bb751b7ff1c2cb61d3619ea2b55a58a5e

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/pojo/WorksheetLink.java

@@ -58,9 +58,6 @@
    @TableField(exist = false)
    private WorksheetMain main;

    @TableField(exist = false)
    private List<ProductBomApproving> bomApprovingList;

    public Integer getId() {
        return id;
    }
@@ -189,11 +186,4 @@
        this.rejectVersion = rejectVersion;
    }

    public List<ProductBomApproving> getBomApprovingList() {
        return bomApprovingList;
    }

    public void setBomApprovingList(List<ProductBomApproving> bomApprovingList) {
        this.bomApprovingList = bomApprovingList;
    }
}

 src/main/resources/mapper/WorksheetMainMapper.xml

@@ -56,61 +56,7 @@
        </collection>
    </resultMap>

    <resultMap id="Map_WorksheetMain2" type="WorksheetMain">
        <id column="mid" property="id"/>
        <result column="title" property="title"/>
        <result column="description" property="description"/>
        <result column="file" property="file"/>
        <result column="begin_time" property="beginTime"/>
        <result column="end_time" property="endTime"/>
        <result column="level" property="level"/>
        <result column="status" property="status"/>
        <result column="end_reason" property="endReason"/>
        <association column="create_user_id" property="createUser" javaType="com.whyc.pojo.DocUser" select="getUser">
            <result column="name" property="name"/>
        </association>
        <collection property="links" ofType="com.whyc.pojo.WorksheetLink">
            <id column="lid" property="id"/>
            <result column="deal_user_id" property="dealUserId"/>
            <result column="deal_type" property="dealType"/>
            <result column="deal_desc" property="dealDesc"/>
            <result column="deal_reason" property="dealReason"/>
            <result column="link_file" property="linkFile"/>
            <result column="link_status" property="linkStatus"/>
            <result column="enable_archive" property="enableArchive"/>
            <result column="create_time" property="createTime"/>
            <result column="deal_time" property="dealTime"/>
            <association property="dealUser" column="deal_user_id" javaType="com.whyc.pojo.DocUser" select="getUser">
                <result column="name" property="name"/>
            </association>
            <collection property="bomApprovingList" ofType="ProductBomApproving">
                <result column="parent_code" property="parentCode"/>
                <result column="parent_name" property="parentName"/>
                <result column="parent_model" property="parentModel"/>
                <result column="type" property="type"/>
                <result column="category" property="category"/>
                <result column="sub_code" property="subCode"/>
                <result column="sub_name" property="subName"/>
                <result column="sub_model" property="subModel"/>
                <result column="unit" property="unit"/>
                <result column="quantity" property="quantity"/>
                <result column="producer" property="producer"/>
                <result column="material" property="material"/>
                <result column="thickness" property="thickness"/>
                <result column="surface_detail" property="surfaceDetail"/>
                <result column="notes" property="notes"/>
                <result column="picture_url" property="pictureUrl"/>
                <result column="file_url" property="fileUrl"/>
                <result column="dwg_url" property="dwgUrl"/>
                <result column="up_user" property="upUser"/>
                <result column="create_date" property="createDate"/>
                <result column="update_date" property="updateDate"/>
                <result column="parent_version" property="parentVersion"/>
            </collection>
        </collection>
    </resultMap>

    <select id="getLinkList" resultMap="Map_WorksheetMain2">
    <select id="getLinkList" resultMap="Map_WorksheetMain">
        SELECT
            m.id mid,m.title,m.description,m.file,m.create_user_id,m.begin_time,m.end_time,m.level,m.status,m.end_reason,
            l.id lid,deal_user_id,deal_type,deal_desc,deal_reason,link_file,link_status,enable_archive,create_time,deal_time,
@@ -123,7 +69,6 @@
            tb_product_bom_approving b ON m.id = b.main_id
        WHERE
        m.id = #{id}
        and l.reject_version = b.reject_version
    </select>
    
    <select id="getUser" resultType="com.whyc.pojo.DocUser">