fix(approve): 修复审批流程为空时的异常处理

liyong

2026-04-30 c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0

 src/main/resources/mapper/production/ProductProcessMapper.xml

@@ -4,23 +4,38 @@

    <select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
        SELECT
        *
        pp.id,
        pp.no,
        pp.remark,
        pp.salary_quota,
        pp.is_quality,
        pp.planner_id,
        pp.planner_name,
        pp.update_time,
        pp.type,
        p.product_name AS name,
        pm.model AS productModel
        FROM
        product_process p
        product_process pp
        left join product_model pm ON pm.id = pp.product_model_id
        left join product p ON p.id = pm.product_id
        <where>
            <if test="productProcessDto.name != null and productProcessDto.name != '' ">
                AND  p.name LIKE CONCAT('%',#{productProcessDto.name},'%')
                AND p.product_name LIKE CONCAT('%',#{productProcessDto.name},'%')
            </if>
            <if test="productProcessDto.no != null and productProcessDto.no != '' ">
                AND  p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
                AND pp.no LIKE CONCAT('%',#{productProcessDto.no},'%')
            </if>
            <if test="productProcessDto.type != null">
                AND pp.type = #{productProcessDto.type}
            </if>
        </where>
        order by p.id asc
        order by pp.id asc
    </select>

    <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">
    <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.ProcessDataProductionStatisticsDto">
        SELECT
        pp.name AS processName,
        pp.type AS processType,
        SUM(pi.quantity) AS totalInput,
        SUM(distinct ppo.scrap_qty) AS totalScrap,
        SUM(distinct (ppo.quantity - ppo.scrap_qty)) AS totalOutput
@@ -40,15 +55,14 @@
            <if test="userId != null">
                AND ppm.user_id = #{userId}
            </if>
            <if test="processIds != null and processIds.size() > 0">
                AND pp.id IN
                <foreach collection="processIds" item="id" open="(" separator="," close=")">
            <if test="processTypes != null and processTypes.size() > 0">
                AND pp.type IN
                <foreach collection="processTypes" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>
        </where>
        GROUP BY
        pp.id,
        pp.name
        pp.type
    </select>
</mapper>