提交部门加载卡住

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);

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);

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/audit/add.html

@@ -8,14 +8,14 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-audit-add">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">计划名称：</label>
+                <label class="col-sm-2 control-label">计划名称：</label>
-                <div class="col-sm-8">
+                <div class="col-sm-10">
                     <input name="planName" id="planName" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">计划描述：</label>
+                <label class="col-sm-2 control-label">计划描述：</label>
-                <div class="col-sm-8">
+                <div class="col-sm-10">
                     <textarea name="planDesc" id="planDesc" class="form-control"></textarea>
                 </div>
             </div>
@@ -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.content = $('#itemContentSummernote').summernote('code');
-                    data.flag = $.form.selectSelects("flag");
+                    // 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) {
+            $("#fileinput").on("filebatchuploadsuccess", function (event, data, previewId, index) {
-                fileUploadCallBack(data.response);
-            })
-            // 同步上传成功回调
-            $("#fileOutput").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();
+        }
     </script>
 </body>
 </html>

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() {
+    public MultipartFile getFile_data() {
-        return file;
+        return file_data;
     }
 
-    public void setFile(MultipartFile file) {
+    public void setFile_data(MultipartFile file_data) {
-        this.file = file;
+        this.file_data = file_data;
     }
 
     @Override

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<LawEnforcementEnterpriseExport> users = ExcelUtils.readMultipartFile(lawPlanAudit.getFile(), LawEnforcementEnterpriseExport.class);
+        List<LawEnforcementEnterpriseExport> 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())){
+        if(ObjectUtil.isNotEmpty(lawPlanAudit.getFile_data())){
-            zdxtFileCommonApi.insertZdxtFile(lawPlanAudit.getFile(), lawPlanAudit.getId(),
+            zdxtFileCommonApi.insertZdxtFile(lawPlanAudit.getFile_data(), lawPlanAudit.getId(),
-                    fileUploadApi.upload(lawPlanAudit.getFile()));
+                    fileUploadApi.upload(lawPlanAudit.getFile_data()));
         }
 
         return lawPlanAuditMapper.insertLawPlanAudit(lawPlanAudit);