fix order test error

Fancy

2024-08-27 3a2117a876cacdafccde8d2ac4a546e048725a23

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

@@ -21,9 +21,21 @@
                     select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.processIsQuote" />
        <association property="planNames" column="id" javaType="java.lang.String" fetchType="eager"
                     select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.selectPlanNamesByProcessId"  />

        <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
                      select="selectByProcess" fetchType="eager" column="id" />
    </resultMap>

    <resultMap id="ProcessResultMap" type="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="proId" column="pro_id" jdbcType="BIGINT"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="creator" column="creator" jdbcType="VARCHAR"/>
        <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
        <result property="disabled" column="disabled" jdbcType="TINYINT"/>
        <result property="deleted" column="deleted" jdbcType="TINYINT"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
                    select="selectByProcess" fetchType="eager" column="id" />
    </resultMap>

    <sql id="Base_Column_List">
@@ -31,7 +43,6 @@
        creator,dt,disabled,
        deleted,remark
    </sql>


    <select id="selectProcessNameById" resultType="java.lang.String">
        select  name
@@ -43,12 +54,18 @@
        from pr_production_node
        where process_id = #{processId,jdbcType=BIGINT}
    </select>
    <select id="selectByProcessId" parameterType="java.lang.Long" resultMap="ProcessResultMap">
        select
        <include refid="Base_Column_List" />
        from pr_production_process
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from pr_production_process
        where  id = #{id,jdbcType=BIGINT} 
        where  id = #{id,jdbcType=BIGINT}
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -61,22 +78,22 @@
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="name != null">name,</if>
                <if test="creator != null">creator,</if>
                <if test="dt != null">dt,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="creator != null and creator !=''">creator,</if>
                <if test="dt != null and dt !=''">dt,</if>
                <if test="disabled != null">disabled,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null">remark,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
@@ -85,13 +102,13 @@
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="name != null">
                <if test="name != null and name !=''">
                    name = #{name,jdbcType=VARCHAR},
                </if>
                <if test="creator != null">
                <if test="creator != null and creator !=''">
                    creator = #{creator,jdbcType=VARCHAR},
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="disabled != null">
@@ -100,7 +117,7 @@
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR},
                </if>
        </set>
@@ -115,7 +132,7 @@
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
<!--            <if test="name != null">-->
<!--            <if test="name != null and name !=''">-->
<!--                name = #{name,jdbcType=VARCHAR} and-->
<!--            </if>-->
        </trim>
@@ -134,12 +151,12 @@
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <!--            <if test="name != null">-->
            <!--            <if test="name != null and name !=''">-->
            <!--                name = #{name,jdbcType=VARCHAR} and-->
            <!--            </if>-->
        </trim>
    </select>
    <select id="queryAll" resultType="map">
    <select id="queryAll" resultType="java.util.HashMap">
        select
            CAST(id AS CHAR) AS id,name
        from pr_production_process