From a309c65fd6c2f2276e6e316457503bb7c817da2e Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Thu, 1 Aug 2024 11:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=83=A8=E9=97=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E5=8D=A1=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/js/ry-ui.js | 2 +- .../resources/static/ruoyi/js/zdxtUtil.js | 2 +- .../project/code/analysis/analysis.html | 2 +- .../templates/project/code/audit/add.html | 40 ++++++++++++------- .../com/zdxt/code/domain/LawPlanAudit.java | 10 ++--- .../service/impl/LawPlanAuditServiceImpl.java | 8 ++-- 6 files changed, 38 insertions(+), 26 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js index 9f8f0feb..4da5b6cb 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js @@ -527,7 +527,7 @@ var table = { showSearch: true, showRefresh: true, showColumns: true, - expandAll: true, + expandAll: false, expandFirst: true }; var options = $.extend(defaults, options); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js index 2262b906..62601a6b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/zdxtUtil.js @@ -524,7 +524,7 @@ var table = { showSearch: true, showRefresh: true, showColumns: true, - expandAll: true, + expandAll: false, expandFirst: true }; var options = $.extend(defaults, options); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html index 3a1fc585..d042ba27 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html @@ -1,4 +1,4 @@ - + diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/audit/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/audit/add.html index 666e3a30..574d66f3 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/audit/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/audit/add.html @@ -8,14 +8,14 @@
- -
+ +
- -
+ +
@@ -44,12 +44,17 @@ $("#form-audit-add").validate({ focusCleanup: true }); + $(function () { + var filePreview = { fileList: null, previewRespDTOS: null } + initFile("fileinput", prefix + "/add", filePreview); + }) function submitHandler() { // if ($.validate.form()) { // $.operate.save(prefix + "/add", $('#form-audit-add').serialize()); // } - xhrSubmit(); + // xhrSubmit(); + $('#fileinput').fileinput('upload'); } function xhrSubmit() { debugger @@ -113,7 +118,7 @@ showPreview: true, showUpload: false, uploadExtraData: function () { - var formData = $("#form-item-add").serialize(); + var formData = $("#form-audit-add").serialize(); formData = decodeURIComponent(formData, true); var arr = formData.split("&"); var data = {}; @@ -122,8 +127,8 @@ var value = item[1].replace("+", " "); data[item[0]] = value; } - data.content = $('#itemContentSummernote').summernote('code'); - data.flag = $.form.selectSelects("flag"); + // data.content = $('#itemContentSummernote').summernote('code'); + // data.flag = $.form.selectSelects("flag"); return data; }, // showBrowse: false, @@ -168,21 +173,28 @@ }, layoutTemplates: { actionDelete: '',//去掉删除按钮 - actionUpload: 'true' // 去掉上传按钮 + actionUpload: '' // 去掉上传按钮 }, initialPreview: filePreview.fileList == null ? [] : filePreview.fileList, initialPreviewConfig: preview == null ? [] : preview }); // 同步上传成功回调 - $("#fileInput").on("filebatchuploadsuccess", function (event, data, previewId, index) { - fileUploadCallBack(data.response); - }) - // 同步上传成功回调 - $("#fileOutput").on("filebatchuploadsuccess", function (event, data, previewId, index) { + $("#fileinput").on("filebatchuploadsuccess", function (event, data, previewId, index) { fileUploadCallBack(data.response); }) }; + + function fileUploadCallBack(result) { + var parent = window.parent; + if (result.success) { + parent.$.modal.msgSuccess(result.message); + } else { + $.modal.alertError(result.message); + } + $.modal.close(); + parent.$.table.refresh(); + } \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawPlanAudit.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawPlanAudit.java index 996fb5d4..dab40161 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawPlanAudit.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawPlanAudit.java @@ -28,7 +28,7 @@ public class LawPlanAudit extends BaseDomain /** * 检查计划文件 */ - private MultipartFile file; + private MultipartFile file_data; public void setId(String id) { @@ -58,12 +58,12 @@ public class LawPlanAudit extends BaseDomain return planDesc; } - public MultipartFile getFile() { - return file; + public MultipartFile getFile_data() { + return file_data; } - public void setFile(MultipartFile file) { - this.file = file; + public void setFile_data(MultipartFile file_data) { + this.file_data = file_data; } @Override diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawPlanAuditServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawPlanAuditServiceImpl.java index fe332ace..5a01ab66 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawPlanAuditServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawPlanAuditServiceImpl.java @@ -93,7 +93,7 @@ public class LawPlanAuditServiceImpl implements ILawPlanAuditService lawPlanAudit.setUserId(user.getUserId()); lawPlanAudit.setDeptId(user.getDeptId()); - List users = ExcelUtils.readMultipartFile(lawPlanAudit.getFile(), LawEnforcementEnterpriseExport.class); + List users = ExcelUtils.readMultipartFile(lawPlanAudit.getFile_data(), LawEnforcementEnterpriseExport.class); for (LawEnforcementEnterpriseExport lawEnforcementEnterpriseExport : users) { System.out.println(lawEnforcementEnterpriseExport.toString()); LawEnforcementEnterprise lawEnforcementEnterprise = new LawEnforcementEnterprise(); @@ -102,9 +102,9 @@ public class LawPlanAuditServiceImpl implements ILawPlanAuditService lawEnforcementEnterpriseService.insertLawEnforcementEnterprise(lawEnforcementEnterprise); } - if(ObjectUtil.isNotEmpty(lawPlanAudit.getFile())){ - zdxtFileCommonApi.insertZdxtFile(lawPlanAudit.getFile(), lawPlanAudit.getId(), - fileUploadApi.upload(lawPlanAudit.getFile())); + if(ObjectUtil.isNotEmpty(lawPlanAudit.getFile_data())){ + zdxtFileCommonApi.insertZdxtFile(lawPlanAudit.getFile_data(), lawPlanAudit.getId(), + fileUploadApi.upload(lawPlanAudit.getFile_data())); } return lawPlanAuditMapper.insertLawPlanAudit(lawPlanAudit);