From 4ffbba2019e29785552013541b121c3fe5a0de8a Mon Sep 17 00:00:00 2001
From: fugang <931571141@qq.com>
Date: Thu, 28 Dec 2023 10:48:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DupdateIdList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/yingji/BPlanEnterpriseMapper.xml       | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
index ed6c44e..68134c4 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
@@ -349,21 +349,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

From f8d5972d9e21867d623be272767a3ea882ca7e72 Mon Sep 17 00:00:00 2001
From: fugang <931571141@qq.com>
Date: Thu, 28 Dec 2023 13:29:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
index 68134c4..82aae0b 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
+++ b/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