排序修改

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -2188,5 +2188,4 @@ ALTER TABLE t_b_sop_info ADD CONSTRAINT t_b_sop_info_un_sop_no UNIQUE KEY (sop_n
 ALTER TABLE t_b_delay_warn ADD CONSTRAINT t_b_delay_warn_un_code UNIQUE KEY (code);
 ALTER TABLE t_b_project_exchange ADD CONSTRAINT t_b_project_exchange_un_exchange_no UNIQUE KEY (exchange_no);
 ALTER TABLE t_b_violation ADD CONSTRAINT t_b_violation_un_code UNIQUE KEY (code);
-ALTER TABLE t_b_crm ADD CONSTRAINT t_b_crm_un_crm_no UNIQUE KEY (crm_no);
-
+ALTER TABLE t_b_crm ADD CONSTRAINT t_b_crm_un_crm_no UNIQUE KEY (crm_no);

sop-business/src/main/resources/mapper/SysDeviceMapper.xml

@@ -24,8 +24,6 @@
             <if test="bound != null and bound != ''">
                 and a.bound = #{bound}
             </if>
-
-
             <if test="enable != null">
                 <choose>
                     <when test="enable">
@@ -37,6 +35,6 @@
                 </choose>
             </if>
         </where>
-        order by a.create_time desc
+        order by a.device_code desc
     </select>
 </mapper>

sop-business/src/main/resources/mapper/TBCrmMapper.xml

@@ -245,11 +245,9 @@
                 ]]>
             </if>
         </where>
-
-
-        ORDER BY
-        a.create_time DESC
+        ORDER BY a.crm_no DESC
     </select>
+
     <select id="findCrmProjectBySopNo" resultType="com.qmth.sop.business.bean.result.CrmProjectResult">
         SELECT
             tbc.crm_no AS crmNo,

sop-business/src/main/resources/mapper/TBDeviceInOutMapper.xml

@@ -92,8 +92,9 @@
                 </choose>
             </if>
         </where>
-        ORDER BY tbs.id DESC,tbdio.in_out_time DESC
+        ORDER BY tbdio.serial_no DESC
     </select>
+
     <select id="findDeviceInOutPageBySource" resultType="com.qmth.sop.business.bean.result.DeviceInOutResult">
         SELECT
             tbdio.id AS inOutId,
@@ -185,8 +186,9 @@
                 </choose>
             </if>
         </where>
-        ORDER BY tbs.id DESC,tbdio.in_out_time DESC
+        ORDER BY tbdio.serial_no DESC
     </select>
+
     <select id="findDeviceCanOutInfo" resultType="com.qmth.sop.business.bean.result.DeviceInOutResult">
         SELECT
             sd.serial_no AS serialNo,