Merge remote-tracking branch 'origin/master'

刘小明

2024-07-17 75fab7170e1f26b83b0f31d65d4e164ca3bba107

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml

@@ -21,6 +21,8 @@
            <result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
            <result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
            <result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
            <result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
            <result property="outLineTime" column="out_line_time" jdbcType="TIMESTAMP"/>
            <result property="memo" column="memo" jdbcType="VARCHAR"/>
    </resultMap>
    <resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast" extends="BaseResultMap">
@@ -78,6 +80,7 @@
        ,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
        ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
        ,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
        ,#{inLineTime,jdbcType=TIMESTAMP},#{outLineTime,jdbcType=TIMESTAMP}
        ,#{memo,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
@@ -99,6 +102,8 @@
                <if test="updatedBy != null">updated_by,</if>
                <if test="inTime != null">in_time,</if>
                <if test="outTime != null">out_time,</if>
                <if test="inLineTime != null">in_line_time,</if>
                <if test="outLineTime != null">out_line_time,</if>
                <if test="memo != null">memo,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -118,6 +123,8 @@
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
                <if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -169,6 +176,12 @@
                <if test="outTime != null">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="inLineTime != null">
                    in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
                </if>
                <if test="outLineTime != null">
                    out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
                </if>
                <if test="memo != null">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
@@ -193,6 +206,8 @@
            updated_by =  #{updatedBy,jdbcType=BIGINT},
            in_time =  #{inTime,jdbcType=TIMESTAMP},
            out_time =  #{outTime,jdbcType=TIMESTAMP},
            in_line_time =  #{inLineTime,jdbcType=TIMESTAMP},
            out_line_time =  #{outLineTime,jdbcType=TIMESTAMP},
            memo =  #{memo,jdbcType=VARCHAR}
        where   id = #{id,jdbcType=BIGINT} 
    </update>