配农网下“审定单，

     咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书”可提交压缩文件

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementAllService.java

@@ -268,7 +268,9 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
                             //查询项目报告信息
                             if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
                                 ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
-                                info.setProjectName(projectReportData.getNumber());
+                                if(null != projectReportData){
+                                    info.setProjectName(projectReportData.getNumber());
+                                }
                             }
                             info.getWorkAccount().setProjectRadio(1);
                         }else{
@@ -1463,4 +1465,4 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
 
     /*-----------------======  新版本=====--------------------------*/
 
-}
+}

src/main/webapp/static/oss/ossupload.js

@@ -37,7 +37,16 @@ function ftlUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,d
     file.name.replace(" ","")
     file.name.replace(/—/g,"")
     var fileName = file.name;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
+    //将中文——转换为英文-
     fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace("……","")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -49,7 +58,16 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     file.name.replace(" ","")
     file.name.replace(/—/g,"")
     var fileName = file.name;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
+    //将中文——转换为英文-
     fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace("……","")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -63,7 +81,16 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     file.name.replace(" ","")
     file.name.replace(/—/g,"")
     var fileName = file.name;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
+    //将中文——转换为英文-
     fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace("……","")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -78,7 +105,16 @@ function fBmultipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uplo
     file.name.replace(" ","")
     file.name.replace(/—/g,"")
     var fileName = file.name;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
+    //将中文——转换为英文-
     fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace("……","")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);