From 72b5d23ab48368c9a8da28b91d0da1e6d7d1c4f0 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 22 十一月 2024 16:24:44 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml index 888dd76..c7f927a 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml @@ -88,4 +88,52 @@ stop_time = #{stopTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=BIGINT} </update> +<!-- 鏌ヨ鎬绘暟 --> + <select id="getInspectsCount" resultType="java.lang.Long"> + SELECT + count(*) + FROM `ope_inspect` oi + INNER JOIN `ba_user` ON oi.inspector_id = ba_user.id + <where> + ba_user.deleted = 0 + <if test="inspectorId != null"> + AND oi.inspector_id = #{inspectorId} + </if> + <if test="inspectId != null"> + AND oi.id = #{inspectId} + </if> + <if test="inspectorName != null"> + AND ba_user.`name` LIKE CONCAT('%',#{inspectorName},'%') + </if> + <if test="timeStart != null and timeStop != null"> + AND oi.start_time BETWEEN #{timeStart} AND #{timeStop} + </if> + </where> + </select> +<!-- 鏌ヨ鍒楄〃 --> + <select id="getInspects" resultType="com.dy.pipIrrGlobal.voOp.VoInspect"> + SELECT + oi.inspector_id AS inspectorId, + ba_user.`name` AS inspectorName, + oi.id AS inspectId, + oi.start_time AS startTime, + oi.stop_time AS stopTime + FROM `ope_inspect` oi + INNER JOIN `ba_user` ON oi.inspector_id = ba_user.id + <where> + ba_user.deleted = 0 + <if test="inspectorId != null"> + AND oi.inspector_id = #{inspectorId} + </if> + <if test="inspectId != null"> + AND oi.id = #{inspectId} + </if> + <if test="inspectorName != null"> + AND ba_user.`name` LIKE CONCAT('%',#{inspectorName},'%') + </if> + <if test="timeStart != null and timeStop != null"> + AND oi.start_time BETWEEN #{timeStart} AND #{timeStop} + </if> + </where> + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0