git

heheng

2025-03-06 07a6e79342c381d4d8c98a92a216c41dc9502a09

 hazmat-system/src/main/resources/mapper/system/HzProductBasicMapper.xml

@@ -20,6 +20,8 @@
        <result property="delFlag"  column="del_flag"  />
        <result property="companyId"         column="company_id"          />
        <result property="version"         column="version"          />
        <result property="peculiarityType"         column="peculiarity_type"          />
        <result property="peculiarityNumber"         column="peculiarity_number"          />
        <result property="createBy"       column="create_by"       />
        <result property="createTime"     column="create_time"     />
        <result property="updateBy"       column="update_by"       />
@@ -27,13 +29,16 @@
        <result property="remark"         column="remark"          />
        <result property="maxEntry"         column="max_entry"          />
        <result property="companyName"         column="company_name"          />
        <result property="riskType" column="risk_type"/>
    </resultMap>

    <sql id="selectProductBasicVo">
        select a.id, a.name, a.cas, a.product_type, a.min_package,a.kind,a.product_character,a.supplier,a.manufacturer,a.product_format,a.metering,
               a.unit,a.price,a.per_box,a.product_sn,a.company_id,a.version, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,a.max_entry,b.name as company_name
               a.unit,a.price,a.per_box,a.product_sn,a.company_id,a.version,a.peculiarity_type,a.peculiarity_number,
               a.create_by, a.create_time, a.update_by, a.update_time, a.remark,a.max_entry,b.name as company_name,hs.risk_type
        from hz_product_basic a
        left join sys_company b on b.id=a.company_id
        LEFT JOIN hz_secientific hs ON a.secientific_id = hs.id
    </sql>

    <update id="deleteProductBasicById" parameterType="java.lang.Long">