修改

“djh”

5 days ago d30017df796e4e4aef20f320f3c27d90ba8cbeff

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

@@ -19,6 +19,7 @@
        <result property="updateBy"       column="update_by"       />
        <result property="updateTime"     column="update_time"     />
        <result property="remark"         column="remark"          />
        <result property="subscribeNum"         column="subscribe_num"          />
        <association property="warehouse" javaType="com.gkhy.hazmat.system.domain.HzWarehouse" resultMap="wareResult" />
        <association property="hazmatBasic" javaType="com.gkhy.hazmat.system.domain.HzHazmatBasic" resultMap="hazmatBasicResult" />
        <association property="cupboard" javaType="com.gkhy.hazmat.system.domain.HzWarehouseCupboard" resultMap="cupboardResult"/>
@@ -54,7 +55,7 @@

    <sql id="selectEntryRecordVo">
        select a.id, a.warehouse_id,a.cupboard_id, a.num,a.batch_no,a.state,a.basic_id,a.company_id,a.start_code,a.end_code,a.code_prex,a.version, a.create_by,
               a.create_time, a.update_by, a.update_time, a.remark,
               a.create_time, a.update_by, a.update_time, a.remark,a.subscribe_num,
               b.id as basic_idd,b.name as basic_name,b.cas as basic_cas,b.hazmat_type as basic_hazmat_type,b.hazmat_character as basic_hazmat_character,
               b.supplier as basic_supplier,b.manufacturer as basic_manufacturer,b.metering as basic_metering,b.unit as basic_unit,b.product_sn,b.min_package as basic_min_package,b.max_entry,
               c.id as warehouse_id,c.name as warehouse_name,d.id as cupboard_id,d.cupboard_name
@@ -67,6 +68,9 @@
            parameterType="com.gkhy.hazmat.system.domain.HzEntryRecord">
        <include refid="selectEntryRecordVo"/>
        <where>
            <if test="type != null">
                and a.type = #{type}
            </if>
            <if test="params.name != null and params.name != ''">
                AND b.name like concat('%', #{params.name}, '%')
            </if>
@@ -79,11 +83,14 @@
            <if test="state != null">
                AND a.state= #{state}
            </if>
            <if test="params.warehouseId !=null">
                and a.warehouse_id = #{params.warehouseId}
            <if test="warehouseId !=null">
                and a.warehouse_id = #{warehouseId}
            </if>
            <if test="params.cupboardId !=null">
                and a.cupboard_id = #{params.cupboardId}
            <if test="cupboardId !=null">
                and a.cupboard_id = #{cupboardId}
            </if>
            <if test="subscribeNum != null">
                and a.subscribe_num = #{subscribeNum}
            </if>
        </where>
        order by a.id desc