-
+
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
index b3d5212..4b85942 100644
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
@@ -34,4 +34,11 @@ public class ZjbController extends Controller {
List list = zm.getModulePageFillInfo(module_id);
renderJson(CommonUtil.renderJsonForLayUI(list));
}
+
+ @Before({GET.class})
+ @IsNumericInterface({"task_id"})
+ public void getTaskPageFillInfo(int task_id) {
+ List list = zm.getTaskPageFillInfo(task_id);
+ renderJson(CommonUtil.renderJsonForLayUI(list));
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
index 559ac96..1a4e794 100644
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
@@ -76,4 +76,38 @@ public class ZjbModel {
}
return res;
}
+
+ public Record getTaskInfo(int task_id) {
+ return Db.findById("t_zjb_task", "task_id", task_id);
+ }
+
+ public List getTaskPageFillInfo(int task_id) {
+ Record rTask = getTaskInfo(task_id);
+ int module_id = rTask.getInt("module_id");
+ Record record = getMoudleInfo(module_id);
+ int page_count = record.getInt("page_count");
+
+ String sql = "select * from t_zjb_task_fill where task_id=?";
+ List exist = Db.find(sql, task_id);
+
+ Map _map = new HashMap<>();
+ for (Record r1 : exist) {
+ _map.put(r1.getInt("page"), r1.getStr("json"));
+ }
+
+ List res = new ArrayList<>();
+ for (int i = 1; i <= page_count; i++) {
+ Record r = new Record();
+ r.set("page", i);
+ if (_map.containsKey(i)) {
+ r.set("json", _map.get(i));
+ r.set("filled", true);
+ } else {
+ r.set("json", "[]");
+ r.set("filled", false);
+ }
+ res.add(r);
+ }
+ return res;
+ }
}
\ No newline at end of file