From 707b5af9ed7c12d18cba597e3f2f76671891034b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期二, 12 十二月 2023 17:27:21 +0800 Subject: [PATCH] 技术状态鉴定 批量点检驳回 审批 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml index 9d2172e..56b1404 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml @@ -8,6 +8,8 @@ t1.num, t1.inspection_time as inspectionDate, t1.inspection_time as inspectionTime, + DATEADD(DAY,+7,t1.inspection_time) as redWarningTime, + CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime, t1.inspection_deadline as inspectionDeadline, t1.start_work_condition as startWorkCondition, t1.status, @@ -60,8 +62,8 @@ <select id="getInspectionCycleByEqId" parameterType="Map" resultType="org.jeecg.modules.eam.model.InspectionCycleVo"> SELECT DISTINCT t1.inspection_cycle_id AS value, - concat(t3.code, '/', t3.name) as text, - concat(t3.code, '/', t3.name) as title + t3.name as text, + t3.name as title FROM mom_eam_daily_inspection_standard_detail t1 LEFT JOIN mom_eam_daily_inspection_standard t2 ON t1.daily_inspection_standard_id = t2.id -- Gitblit v1.9.3