From abd8ca3f3a51423abc469b211a7c1d36ce9dfc28 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 11 十一月 2024 18:52:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
index 56a5430..4315729 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
@@ -195,8 +195,44 @@
where id = #{id,jdbcType=BIGINT}
</update>
- <!--鏍规嵁workOrderId鑾峰彇鏈垹闄ょ殑澶勭悊缁撴灉鏁伴噺锛屾坊鍔犵粨鏋滀笂鎶ュ墠鍒ゆ柇浣跨敤-->
- <select id="getValidResultCount" resultType="java.lang.Integer">
- SELECT COUNT(*) FROM ope_processing_result WHERE deleted = 0 AND work_order_id = #{workOrderId}
+ <!--鏍规嵁宸ュ崟ID鑾峰彇鏈垹闄ょ殑宸ュ崟瀵硅薄-->
+ <select id="getByWorkOrderId" resultType="com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult">
+ SELECT * FROM ope_processing_result WHERE deleted = 0 AND work_order_id = #{workOrderId} LIMIT 1
+ </select>
+
+ <!--鑾峰彇鎸囧畾宸℃鍛樼殑鎸囧畾鏈垹闄や笖鏈鎵圭殑澶勭悊缁撴灉涓婃姤锛屽垹闄ゅ鐞嗙粨鏋滃墠鍒ゆ柇浣跨敤浣跨敤-->
+ <select id="getProResult" resultType="com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult">
+ SELECT * FROM ope_processing_result
+ WHERE deleted = 0 AND state = 1 AND id = #{proResultId} AND inspector_id = #{inspectorId} LIMIT 1
+ </select>
+
+ <!--閫昏緫鍒犻櫎涓�涓湭鍒犻櫎鐨勫鐞嗙粨鏋滆褰�-->
+ <update id="deleteProResult">
+ UPDATE ope_processing_result SET deleted = UNIX_TIMESTAMP() WHERE deleted = 0 AND id = #{proResultId}
+ </update>
+
+ <!--鏍规嵁涓婚敭鑾峰彇澶勭悊缁撴灉瑙嗗浘瀵硅薄-->
+ <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult">
+ SELECT
+ res.id AS proResultId,
+ res.work_order_id AS workOrderId,
+ us.name AS inspector,
+ res.content,
+ res.images,
+ res.audios,
+ res.videos,
+ res.lng,
+ res.lat,
+ res.complete_time AS completeTime,
+ res.report_time AS reportTime,
+ res.state,
+ CASE
+ WHEN res.state = 1 THEN '宸蹭笂鎶�'
+ WHEN res.state = 2 THEN '宸查�氳繃'
+ WHEN res.state = 3 THEN '宸查┏鍥�'
+ END AS stateName
+ FROM ope_processing_result res
+ INNER JOIN ba_user us ON us.id = res.inspector_id
+ WHERE res.deleted = 0 AND res.id = #{proResultId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0