blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-12-18 b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d 
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml


@@ -37,6 +37,7 @@


        <association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">


            <result property="orderId" column="order_id"/>


            <result property="productionId" column="production_id"/>


            <result property="processId" column="processIdFirst"/>


        </association>


        <association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">


            <result property="completedQuantity" column="completed_quantity"/>


@@ -69,6 +70,7 @@


    <select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">


        select o.order_id,


               fc.production_id,


               fc.process_id as 'processIdFirst',


               o.customer_id,


               o.customer_name,


               o.project,


@@ -579,7 +581,7 @@


            and rw.device_name regexp #{reportingWork.deviceName}


        </if>


        <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">


            and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}


            and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')


        </if>


        GROUP BY rw.reporting_work_id


        ORDER BY rw.reporting_work_id desc


@@ -1064,7 +1066,7 @@


            and o.order_id regexp #{reportingWork.orderId}


        </if>


        <if test="reportingWork.processId != null and reportingWork.processId != ''">


            and rw.process_id regexp #{reportingWork.processId}


            and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')


        </if>


        <if test="reportingWork.order.project != null and reportingWork.order.project != ''">


            and o.project regexp #{reportingWork.order.project}


@@ -1079,7 +1081,7 @@


            and rw.device_name regexp #{reportingWork.deviceName}


        </if>


        <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">


            and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}


            and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')


        </if>


    </select>