From f8a7078cfaf8f4106f1081856260eae55a3a2579 Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期二, 18 三月 2025 08:55:44 +0800 Subject: [PATCH] 完成点检模块 --- eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInspectRecordMapper.xml | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInspectRecordMapper.xml b/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInspectRecordMapper.xml index db8135f..bf14d6a 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInspectRecordMapper.xml +++ b/eims/ruoyi-modules/lb-eims/src/main/resources/mapper/eims/EimsInspectRecordMapper.xml @@ -6,6 +6,10 @@ <resultMap type="org.dromara.eims.domain.vo.EimsInspectRecordVo" id="EimsInspRecordVoResult"> </resultMap> + + <resultMap type="org.dromara.eims.domain.vo.EimsInspectStVo" id="EimsInspectStVoResult"> + </resultMap> + <select id="selectInspRecordList" resultMap="EimsInspRecordVoResult"> SELECT ir.*,equ.equ_name equName,equ.equ_code equCode,equ.asset_no assetNo,equ.model_no modelNo,ir.create_time createTime, us.nick_name inspUserName,dp.dept_name inspDeptName,ue.nick_name verifyUserName @@ -17,4 +21,31 @@ ${ew.getCustomSqlSegment} </select> + + <select id="selectInspRecordDayList" resultMap="EimsInspectStVoResult"> + SELECT + MAX(ir.id) id, + ir.equ_id, + ir.plan_time, + DATE_FORMAT(ir.plan_time, '%Y-%m-%d') as planTimeStr, + CONCAT(DATE_FORMAT(ir.plan_time, '%Y%m%d'), equ.equ_name) as title, + MAX(equ.equ_name) AS equName, + MAX(equ.equ_code) AS equCode, + MAX(equ.asset_no) AS assetNo, + MAX(equ.model_no) AS modelNo, + GROUP_CONCAT(us.nick_name SEPARATOR ', ') AS inspUserNames, + GROUP_CONCAT(ue.nick_name SEPARATOR ', ') AS verifyUserNames, + COUNT(ir.id) AS recordCount, -- 涓�澶╃偣妫�鎬绘暟 + SUM(CASE WHEN ir.status = 0 THEN 1 ELSE 0 END) AS unCheckCount, + SUM(CASE WHEN ir.status = 1 THEN 1 ELSE 0 END) AS checkCount, + SUM(CASE WHEN ir.insp_result = 1 THEN 1 ELSE 0 END) AS normalNum, + SUM(CASE WHEN ir.insp_result = 2 THEN 1 ELSE 0 END) AS abNormalNum + FROM eims_inspect_record ir + LEFT JOIN eims_equ equ ON ir.equ_id = equ.equ_id + LEFT JOIN sys_user us ON ir.insp_user = us.user_id + LEFT JOIN sys_user ue ON ir.verify_user = ue.user_id + LEFT JOIN sys_dept dp ON ir.insp_dept = dp.dept_id + ${ew.getCustomSqlSegment} + </select> + </mapper> -- Gitblit v1.9.3