From 88bda16f8f5ec4e81742abc3ab411f64e8e44945 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 9 Jan 2024 10:40:30 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-9-1=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=95=85=E9=9A=9C=E6=8F=8F=E8=BF=B0=20=E5=9B=9B?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=20=E6=95=85=E9=9A=9C=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98+=E9=A1=B5=E9=9D=A2=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/device/EquFaultDescriptionMapper.xml    | 3 ++-
 .../main/resources/mapper/device/EquFaultMeasuresMapper.xml  | 3 ++-
 .../main/resources/mapper/device/EquFaultReasonMapper.xml    | 5 ++++-
 .../src/main/resources/mapper/device/EquFaultTypeMapper.xml  | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
index 12795702..40eef969 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml
@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
 			and del_flag = '0'
 		</where>
+		ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER)
 	</select>
 	
 	<select id="selectEquFaultDescriptionByFaultId" parameterType="String" resultMap="EquFaultDescriptionResult">
@@ -122,6 +123,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectSerialNumber" resultType="java.lang.Integer">
 		SELECT COUNT(fault_id)+1 AS serialNum
 		FROM equ_fault_description
-		WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
+		WHERE del_flag = '0'
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml
index eaafe629..6f98ab3b 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml
@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
 			and del_flag = '0'
 		</where>
+		ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER)
 	</select>
 	
 	<select id="selectEquFaultMeasuresByFaultId" parameterType="String" resultMap="EquFaultMeasuresResult">
@@ -122,6 +123,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectSerialNumber" resultType="java.lang.Integer">
 		SELECT COUNT(fault_id)+1 AS serialNum
 		FROM equ_fault_measures
-		WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
+		WHERE del_flag = '0'
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml
index 10b95ba1..431465fc 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml
@@ -45,11 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
 			and del_flag = '0'
 		</where>
+		ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER)
 	</select>
 	
 	<select id="selectEquFaultReasonByFaultId" parameterType="String" resultMap="EquFaultReasonResult">
 		<include refid="selectEquFaultReasonVo"/>
 		where fault_id = #{faultId}
+
+
 	</select>
 		
 	<insert id="insertEquFaultReason" parameterType="EquFaultReason">
@@ -122,6 +125,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectSerialNumber" resultType="java.lang.Integer">
 		SELECT COUNT(fault_id)+1 AS serialNum
 		FROM equ_fault_reason
-		WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
+		WHERE del_flag = '0'
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml
index b9268d5f..99fc05b3 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml
@@ -50,7 +50,7 @@
 			<if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
 			and del_flag = '0'
 		</where>
-		ORDER BY create_time DESC
+		ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER)
 	</select>
 
 	<select id="selectEquFaultTypeByFaultId" parameterType="String" resultMap="EquFaultTypeResult">
@@ -61,7 +61,7 @@
 	<select id="selectSerialNumber" resultType="java.lang.Integer">
 		SELECT COUNT(fault_id)+1 AS serialNum
 		FROM equ_fault_type
-		WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
+		WHERE del_flag = '0'
 	</select>
 
 	<insert id="insertEquFaultType" parameterType="EquFaultType">