Merge remote-tracking branch 'origin/master'

刘小明

2024-07-17 75fab7170e1f26b83b0f31d65d4e164ca3bba107

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

@@ -24,13 +24,20 @@
    <select id="selectLineNameById" parameterType="java.lang.Long" resultType="String">
        select name from plt_production_line where id = #{lineId}
    </select>
    <select id="selectNameByStationId" parameterType="java.lang.Long" resultType="String">
        select name from plt_station where id = #{id}
    </select>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from plt_station
        where  id = #{id,jdbcType=BIGINT} 
        where  id = #{id,jdbcType=BIGINT} and deleted!=1
    </select>

    <select id="selectByName" parameterType="java.lang.String" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from plt_station where name = #{name,jdbcType=VARCHAR} and deleted!=1
    </select>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
        insert into plt_station
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -94,6 +101,30 @@
        </trim>
    </select>

    <select id="selectStationList" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from plt_station where deleted!=1
        <trim prefix="and" suffixOverrides="and">
            <if test="id != null and id !=''">
                id = #{id,jdbcType=BIGINT} and
            </if>
            <if test="code != null and code !=''">
                code = #{code,jdbcType=VARCHAR} and
            </if>
            <if test="name != null and name !=''">
                name  like concat('%', #{name}, '%') and
            </if>
            <if test="disabled != null and disabled !=''">
                disabled = #{disabled,jdbcType=TINYINT} and
            </if>
            <if test="lineId != null and lineId !=''">
                line_id = #{lineId,jdbcType=BIGINT} and
            </if>
        </trim>
        order by id desc
    </select>

    <select id="selectSomeCount" resultType="java.lang.Long">
        select count(1)
        from plt_station where deleted!=1
@@ -114,6 +145,14 @@
            </if>
        </trim>
    </select>
    <select id="selectAll" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from plt_station where deleted!=1
    </select>
    <select id="selectMaxCode" resultType="java.lang.String">
        select max(code) from plt_station
    </select>

    <update id="deleteLogicById" parameterType="java.lang.Long">
        update plt_station set deleted = 1