From 770edb74e75dcc9582d47dc44a6f6270bfd88b59 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 27 Sep 2024 09:20:02 +0800
Subject: [PATCH] 'commit'

---
 .idea/workspace.xml                           | 48 ++++++++++---------
 .../resource/Base/Model/BaseModel.java        | 15 +++++-
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6ae99f01..05e74267 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -26,6 +26,7 @@
     <option name="importingSettings">
       <MavenImportingSettings>
         <option name="vmOptionsForImporter" value="-Xms1024m -Xmx2048m" />
+        <option name="workspaceImportForciblyTurnedOn" value="true" />
       </MavenImportingSettings>
     </option>
   </component>
@@ -38,27 +39,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "main",
-    "kotlin-language-version-configured": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "模块",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
-    "vue.rearranger.settings.migration": "true",
-    "应用程序.BaseApplication.executor": "Debug",
-    "应用程序.GwApplication.executor": "Debug",
-    "应用程序.ResApplication.executor": "Debug"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
+    &quot;应用程序.BaseApplication.executor&quot;: &quot;Debug&quot;,
+    &quot;应用程序.GwApplication.executor&quot;: &quot;Debug&quot;,
+    &quot;应用程序.ResApplication.executor&quot;: &quot;Debug&quot;
   }
-}]]></component>
-  <component name="RunManager" selected="应用程序.ResApplication">
+}</component>
+  <component name="RunManager" selected="应用程序.BaseApplication">
     <configuration name="BaseApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.base.BaseApplication" />
       <module name="dsBase" />
@@ -100,17 +101,17 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="应用程序.ResApplication" />
         <item itemvalue="应用程序.BaseApplication" />
         <item itemvalue="应用程序.GwApplication" />
+        <item itemvalue="应用程序.ResApplication" />
       </list>
     </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-b114ca120d71-intellij.indexing.shared.core-IU-242.21829.142" />
-        <option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-IU-242.21829.142" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17011.79" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17011.79" />
       </set>
     </attachedChunks>
   </component>
@@ -124,6 +125,7 @@
       <updated>1727339918298</updated>
       <workItem from="1727339920435" duration="293000" />
       <workItem from="1727340224328" duration="3509000" />
+      <workItem from="1727399806173" duration="147000" />
     </task>
     <servers />
   </component>
diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
index 24f36891..89580163 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java
@@ -4,7 +4,9 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class BaseModel {
     /**
@@ -17,6 +19,15 @@ public class BaseModel {
         return Db.find(sql);
     }
 
+    public Map<Integer, String> getStageMap() {
+        List<Record> list = getStageList();
+        Map<Integer, String> map = new HashMap<>();
+        for (Record record : list) {
+            map.put(record.getInt("stage_id"), record.getStr("stage_name"));
+        }
+        return map;
+    }
+
     public Record getStage(int stage_id) {
         String sql = "select * from t_dm_stage where stage_id=?";
         return Db.findFirst(sql, stage_id);
@@ -116,9 +127,9 @@ public class BaseModel {
             subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id);
         }
 
-        String stageName = getStage(stage_id).getStr("stage_name");
+        Map<Integer, String> map = getStageMap();
         for (Record record : subjectPage.getList()) {
-            record.set("stage_name", stageName);
+            record.set("stage_name", map.get(record.getInt("stage_id")));
         }
         return subjectPage;
     }