Merge branch 'dev_cr' into dev

chenrui

2025-03-11 379222715511cc4d6efd4abbbb3463f5485f590d

 basic-server/src/main/resources/mapper/ProductMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.ProductMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.Product">
    <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.Product">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="nameEn" column="name_en" jdbcType="VARCHAR"/>
@@ -14,13 +14,7 @@
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="objectId" column="object_id" jdbcType="INTEGER"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,name,name_en,
        create_user,update_user,create_time,
        update_time,object_id
    </sql>
    <select id="selectProductListByObjectId" resultType="com.ruoyi.inspect.pojo.Product">
    <select id="selectProductListByObjectId" resultType="com.ruoyi.basic.pojo.Product">
        select * from (
        select p.id,
               p.name,
@@ -41,4 +35,10 @@
                ${ew.customSqlSegment}
            </if>
    </select>

    <select id="getWordQrModel" resultType="java.lang.String">
        SELECT GROUP_CONCAT(DISTINCT isa.model) model
        FROM ins_sample isa
        where isa.ins_order_id = #{orderId}
    </select>
</mapper>