2024-1-9-1 设备管理-故障描述 四个页面 故障编码问题+页面排序展示问题

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>

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>

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>

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">