Merge remote-tracking branch 'origin/master'

刘小明

2024-07-17 75fab7170e1f26b83b0f31d65d4e164ca3bba107

 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">