修改

hdy

2025-03-18 3f23422c13226ce37150afed0b4d8d0309da45d3

 billion-main/src/main/resources/mapper/da/DaMaterialCollectionMapper.xml

@@ -12,10 +12,12 @@
        <result property="paramName"    column="param_name"    />
        <result property="paramValue"    column="param_value"    />
        <result property="collectTime"    column="collect_time"    />
        <result property="materialCode"    column="material_code"    />
        <result property="materialName"    column="material_name"    />
    </resultMap>

    <sql id="selectDaMaterialCollectionVo">
        select id, sfc_code, location_code, param_code, param_name, param_value, collect_time from da_material_collection
        select id, material_code, material_name, sfc_code, location_code, param_code, param_name, param_value, collect_time from da_material_collection
    </sql>

    <select id="selectDaMaterialCollectionList" parameterType="DaMaterialCollection" resultMap="DaMaterialCollectionResult">
@@ -25,6 +27,8 @@
            <if test="locationCode != null  and locationCode != ''"> and location_code like concat('%', #{locationCode}, '%')</if>
            <if test="paramCode != null  and paramCode != ''"> and param_code like concat('%', #{paramCode}, '%')</if>
            <if test="paramName != null  and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
            <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"><!-- 开始时间检索 -->
                and collect_time BETWEEN #{params.beginTime} and #{params.endTime}
            </if>
@@ -45,6 +49,8 @@
            <if test="paramName != null">param_name,</if>
            <if test="paramValue != null">param_value,</if>
            <if test="collectTime != null">collect_time,</if>
            <if test="materialCode != null">material_code,</if>
            <if test="materialName != null">material_name,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="sfcCode != null">#{sfcCode},</if>
@@ -53,6 +59,8 @@
            <if test="paramName != null">#{paramName},</if>
            <if test="paramValue != null">#{paramValue},</if>
            <if test="collectTime != null">#{collectTime},</if>
            <if test="materialCode != null">#{materialCode},</if>
            <if test="materialName != null">#{materialName},</if>
         </trim>
    </insert>

@@ -65,6 +73,8 @@
            <if test="paramName != null">param_name = #{paramName},</if>
            <if test="paramValue != null">param_value = #{paramValue},</if>
            <if test="collectTime != null">collect_time = #{collectTime},</if>
            <if test="materialCode != null">material_code = #{materialCode},</if>
            <if test="materialName != null">material_name = #{materialName},</if>
        </trim>
        where id = #{id}
    </update>