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 @@
@@ -38,27 +39,27 @@
- {
+ "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": "preferences.pluginManager",
+ "vue.rearranger.settings.migration": "true",
+ "应用程序.BaseApplication.executor": "Debug",
+ "应用程序.GwApplication.executor": "Debug",
+ "应用程序.ResApplication.executor": "Debug"
}
-}]]>
-
+}
+
@@ -100,17 +101,17 @@
-
+
-
-
+
+
@@ -124,6 +125,7 @@
1727339918298
+
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 getStageMap() {
+ List list = getStageList();
+ Map 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 map = getStageMap();
for (Record record : subjectPage.getList()) {
- record.set("stage_name", stageName);
+ record.set("stage_name", map.get(record.getInt("stage_id")));
}
return subjectPage;
}