From 9e5ecb83ba191db31cc74fcd17e5c301dcd31e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 27 Dec 2022 08:10:39 +0800 Subject: [PATCH] 'commit' --- .../formDesign/ayq/modules/formDesigner.js | 2 +- WebRoot/html/formDesign/fill.html | 38 +++++++++++++------ .../Zjb/Controller/ZjbController.java | 7 ++++ .../dsideal/FengHuang/Zjb/Model/ZjbModel.java | 23 ++++++++++- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/WebRoot/html/formDesign/ayq/modules/formDesigner.js b/WebRoot/html/formDesign/ayq/modules/formDesigner.js index 7f5161f..d21b5f7 100644 --- a/WebRoot/html/formDesign/ayq/modules/formDesigner.js +++ b/WebRoot/html/formDesign/ayq/modules/formDesigner.js @@ -4663,7 +4663,7 @@ layui.config({base: './ayq/modules/'}).define(["layer", 'flow', "laytpl", "eleme success: function (result) { layer.msg('保存成功!', {icon: 1, time: 1500}, function (index) { - if (flag) window.location.href = "listPageInfo.html?module_id=" + module_id; + if (flag) window.location.href = "listModulePageInfo.html?module_id=" + module_id; } ); return; diff --git a/WebRoot/html/formDesign/fill.html b/WebRoot/html/formDesign/fill.html index 5ed5b45..bca0f89 100644 --- a/WebRoot/html/formDesign/fill.html +++ b/WebRoot/html/formDesign/fill.html @@ -3,7 +3,7 @@ - Layui + 填报内容 @@ -22,6 +22,9 @@ + + + \ 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 eab78e1..09915fb 100644 --- a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java +++ b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java @@ -21,6 +21,13 @@ public class ZjbController extends Controller { renderJson(CommonUtil.returnMessageJson(true, "保存成功!")); } + @Before({POST.class}) + @IsNumericInterface({"task_id", "page"}) + public void saveFillPage(int task_id,int page,String json){ + zm.saveFillPage(task_id, page, json); + renderJson(CommonUtil.returnMessageJson(true, "保存成功!")); + } + @Before({GET.class}) @IsNumericInterface({"module_id", "page"}) public void getModulePage(int module_id, int page) { 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 efe68b6..94d1de4 100644 --- a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java +++ b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java @@ -1,5 +1,6 @@ package com.dsideal.FengHuang.Zjb.Model; +import cn.hutool.core.date.DateTime; import com.dsideal.FengHuang.LoginPerson.Model.LoginPersonModel; import com.dsideal.FengHuang.Util.CommonUtil; import com.dsideal.FengHuang.Util.IpUtil; @@ -23,6 +24,11 @@ public class ZjbModel { Db.update(sql, module_id, page); } + public void delFillPage(int task_id, int page) { + String sql = "delete from t_zjb_task_fill where task_id=? and page=?"; + Db.update(sql, task_id, page); + } + /* 功能：保存模块页面的内容 作者：黄海 @@ -37,6 +43,19 @@ public class ZjbModel { Db.save("t_zjb_module_page", "module_id,page", record); } + public void saveFillPage(int task_id,int page,String json){ + delFillPage(task_id,page); + Record record = new Record(); + record.set("task_id", task_id); + Record rTask = getTaskInfo(task_id); + int module_id = rTask.getInt("module_id"); + record.set("module_id", module_id); + record.set("page", page); + record.set("json", json); + record.set("create_time", DateTime.now()); + Db.save("t_zjb_task_fill", "task_id,page", record); + } + /* 功能：获取指定模板，指定页码的JSON内容 */ @@ -51,7 +70,9 @@ public class ZjbModel { String sql = "select json from t_zjb_task_fill where task_id=? and page=?"; List list = Db.find(sql, task_id, page); if (list.size() > 0) return list.get(0).getStr("json"); - return "[]"; + //直接获取原始模板json进行显示 + Record record = getTaskInfo(task_id); + return getModulePage(record.getInt("module_id"), page); } public Record getMoudleInfo(int module_id) {