From 313a6b128a78173c1c1ae1791abf2aa60284e664 Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期三, 14 五月 2025 13:57:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml index 9f9a7ca..cb97682 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml +++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml @@ -23,12 +23,14 @@ <result property="createBy" column="create_by" /> <result property="delFlag" column="del_flag" /> <result property="warning" column="warning" /> + <result property="exceptionStatus" column="exception_status" /> </resultMap> <sql id="selectApsPlateProcessStatVo"> select id, work_order_no, process_name, num, route_process_number, current_process_number, production_quantity, standard_time, process_total_time, process_plan_end_day,process_plan_start_day, order_plan_end_day, design_times, - batch_number, create_by, del_flag, warning + batch_number, create_by, del_flag, warning, + CASE WHEN <![CDATA[ process_plan_start_day <= NOW() OR process_plan_end_day <= NOW() ]]> THEN '鏄�' ELSE '鍚�' END as exception_status from aps_plate_process_stat </sql> -- Gitblit v1.9.3