Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu

ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml

@@ -234,13 +234,7 @@
                 and b.xtlx = #{req.xtlx}
             </if>
         </where>
-        ORDER BY
+        order by FIELD(status,1,0,3,4,5)
-        CASE
-
-        WHEN b.STATUS = 1 THEN
-        0 ELSE 1
-        END,
-        b.STATUS ASC
     </select>
     <select id="findBytaskIdandAssestId" resultType="com.ruoyi.tc.entity.po.AssetCurrentCpPo">
         select *