Merge remote-tracking branch 'origin/main'

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -107,7 +107,7 @@
                 </foreach>
             </if>
         </where>
-        order by law_sort,planned_month+0
+        order by isPoint desc
     </select>
     <delete id="deleteByPlanId">
         delete
@@ -177,6 +177,7 @@
                 </foreach>
             </if>
         </where>
+        order by law_sort,planned_month+0
     </select>
     <select id="page" resultType="com.ruoyi.programManagement.entity.BPlanEnterprise">
         select * from b_plan_enterprise
@@ -349,21 +350,6 @@
         ) e ON a.enterprise_id = e.USC_CODE
     </select>
 
-    <update id="updateIdList">
-        UPDATE b_enterprise_new a
-        INNER JOIN (
-        SELECT
-            USC_CODE,
-            MAX_EXAMINE_END_TIME 
-        FROM
-            ( SELECT ROW_NUMBER ( ) over ( PARTITION BY USC_CODE ORDER BY EXAMINE_END_TIME DESC ) rowId, USC_CODE, EXAMINE_END_TIME AS MAX_EXAMINE_END_TIME FROM sz_enfor_examine ) S 
-        WHERE
-            rowId = 1 
-            ) c ON a.enterprise_id = c.USC_CODE 
-            SET a.EXAMINE_END_TIME = c.MAX_EXAMINE_END_TIME
-    </update>
-
-
     <update id="updateIdList" parameterType="java.util.List">
         UPDATE b_plan_enterprise
         SET status = 1