From 5ceca957811a0da3741cf4957e6f1fcfca807be6 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 26 十二月 2025 23:42:00 +0800
Subject: [PATCH] feat:增加显示强制完成按钮控制
---
ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml
index 3320df2..d536817 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml
@@ -30,10 +30,16 @@
<result property="serviceOrdTraPaidType" column="ServiceOrdTraPaidType" />
<result property="serviceOrdTraPaidPrice" column="ServiceOrdTraPaidPrice" />
<result property="serviceOrdUnitRemarks" column="ServiceOrdUnitRemarks" />
+ <result property="serviceOrdCCTime" column="ServiceOrd_CC_Time" />
+ <result property="serviceOrdVisit" column="ServiceOrdVisit" />
</resultMap>
-
+ <resultMap type="java.util.HashMap" id="ServiceCancelResult">
+ <result property="ServiceOrdState" column="ServiceOrdState" />
+ <result property="ServiceOrdCancelReason" column="ServiceOrdCancelReason" />
+ <result property="ServiceOrdCancelReasonTXT" column="ServiceOrdCancelReasonTXT" />
+ </resultMap>
<sql id="selectServiceOrderVo">
- select ServiceOrdID, ServiceOrdUserID, ServiceOrdClass, ServiceOrdType, ServiceOrdState, ServiceOrdStartDate, ServiceOrdApptDate, ServiceOrdCoName, ServiceOrdCoPhone, ServiceOrdPtName, ServiceOrdPtAge, ServiceOrdPtSex, ServiceOrdPtKG, ServiceOrdPtNat, ServiceOrdPtIDCard, ServiceOrdTraProvince, ServiceOrdTraCity, ServiceOrdTraStreet, ServiceOrdTraEnd, ServiceOrdTraDistance, ServiceOrdTraUnitPrice, ServiceOrdTraTxnPrice, ServiceOrdTraPaidType, ServiceOrdTraPaidPrice, ServiceOrdUnitRemarks from ServiceOrder
+ select ServiceOrdID, ServiceOrdUserID, ServiceOrdClass, ServiceOrdType, ServiceOrdState, ServiceOrdStartDate, ServiceOrdApptDate, ServiceOrdCoName, ServiceOrdCoPhone, ServiceOrdPtName, ServiceOrdPtAge, ServiceOrdPtSex, ServiceOrdPtKG, ServiceOrdPtNat, ServiceOrdPtIDCard, ServiceOrdTraProvince, ServiceOrdTraCity, ServiceOrdTraStreet, ServiceOrdTraEnd, ServiceOrdTraDistance, ServiceOrdTraUnitPrice, ServiceOrdTraTxnPrice, ServiceOrdTraPaidType, ServiceOrdTraPaidPrice, ServiceOrdUnitRemarks, ServiceOrd_CC_Time, ServiceOrdVisit from ServiceOrder
</sql>
<sql id="selectServiceOrderWhere">
@@ -50,6 +56,7 @@
<if test="serviceOrder.serviceOrdPtAge != null and serviceOrder.serviceOrdPtAge != ''"> and ServiceOrdPtAge = #{serviceOrder.serviceOrdPtAge}</if>
<if test="serviceOrder.serviceOrdPtSex != null and serviceOrder.serviceOrdPtSex != ''"> and ServiceOrdPtSex = #{serviceOrder.serviceOrdPtSex}</if>
<if test="serviceOrder.serviceOrdPtIDCard != null and serviceOrder.serviceOrdPtIDCard != ''"> and ServiceOrdPtIDCard = #{serviceOrder.serviceOrdPtIDCard}</if>
+ <if test="serviceOrder.serviceOrdTraTxnPrice != null and serviceOrder.serviceOrdTraTxnPrice != ''"> and ServiceOrdTraTxnPrice = #{serviceOrder.serviceOrdTraTxnPrice}</if>
</where>
</sql>
@@ -171,4 +178,25 @@
#{serviceOrdId}
</foreach>
</delete>
+
+ <!-- 鏇存柊鏈嶅姟璁㈠崟鍙栨秷淇℃伅 -->
+ <update id="updateServiceOrderCancelInfo">
+ update ServiceOrder
+ set ServiceOrdState = 4,
+ ServiceOrdCancelReason = #{cancelReason},
+ ServiceOrdCancelReasonTXT = #{cancelReasonText}
+ where ServiceOrdID = #{serviceOrdId}
+ </update>
+
+ <!-- 鏍规嵁鏈嶅姟璁㈠崟ID鏌ヨ璁㈠崟鐘舵�� -->
+ <select id="selectServiceOrderStateById" parameterType="Long" resultType="Integer">
+ select ServiceOrdState
+ from ServiceOrder
+ where ServiceOrdID = #{serviceOrdId}
+ </select>
+ <select id="selectServiceCancelInfoById" parameterType="Long" resultMap="ServiceCancelResult">
+ select ServiceOrdState, ServiceOrdCancelReason, ServiceOrdCancelReasonTXT
+ from ServiceOrder
+ where ServiceOrdID = #{serviceOrdId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1