Merge remote-tracking branch 'origin/master'

Fancy

2024-06-20 4837d8e606a630945a8150cd8dff3fb0e48f0784

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

@@ -24,6 +24,8 @@
            select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
        <association property="batchNo" column="batch_id" javaType="java.lang.Long"
            select="com.dy.pmsGlobal.daoPr.PrBatchNumberMapper.selectBatchNoById" fetchType="eager" />
        <association property="processName" column="process_id" javaType="java.lang.Long"
            select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectProcessNameById" fetchType="eager" />
    </resultMap>

    <sql id="Base_Column_List">
@@ -34,11 +36,69 @@
        deleted,content
    </sql>

    <select id="selectPlanNamesByProcessId" resultType="java.lang.String" >
        select GROUP_CONCAT(name SEPARATOR ',')
        from pr_assembly_plan
        where process_id = #{processId} and deleted = 0
    </select>
    <select id="processIsQuote" resultType="java.lang.Boolean" parameterType="java.lang.Long">
        select count(1)
        from pr_assembly_plan
        where  deleted = 0
        <if test="id != null">
            and process_id = #{id}
        </if>
    </select>
    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from pr_assembly_plan
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <select id="selectList" resultMap="BaseResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
        select
        <include refid="Base_Column_List" />
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <if test="batchId != null">
                batch_id = #{batchId,jdbcType=BIGINT} and
            </if>
            <if test="processId != null">
                process_id = #{processId,jdbcType=BIGINT} and
            </if>
            <if test="name != null">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="number != null">
                number = #{number,jdbcType=INTEGER} and
            </if>
            <if test="status != null">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="creator != null">
                creator = #{creator,jdbcType=VARCHAR} and
            </if>
            <if test="dt != null">
                dt = #{dt,jdbcType=TIMESTAMP} and
            </if>
            <if test="startDate != null">
                start_date = #{startDate,jdbcType=VARCHAR} and
            </if>
            <if test="endDate != null">
                end_date = #{endDate,jdbcType=VARCHAR} and
            </if>
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT} and
            </if>
            <if test="content != null">
                content = #{content,jdbcType=VARCHAR} and
            </if>
        </trim>
        order by id desc
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -189,6 +249,14 @@
            </if>
        </trim>
    </select>
    <select id="exists" resultType="java.lang.Boolean">
        select count(1) > 0
        from pr_assembly_plan
        where name = #{name,jdbcType=VARCHAR}
        <if test="id != null">
            and id != #{id,jdbcType=BIGINT}
        </if>
    </select>

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