WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zer0Black
2022-06-11 13:41:45 +08:00
parent 55acd6c0da e9d2db2e2a
commit 356bb6c9a0
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+14 -12
View File
@@ -5326,6 +5326,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
InputStream fin = null; InputStream fin = null;
ServletOutputStream out = null; ServletOutputStream out = null;
//导出只有英文，去除中英文切换。
params.put("cut",CutEnum.EN.getValue());
String id = (String) params.get("id"); String id = (String) params.get("id");
String cut = (String) params.get("cut"); String cut = (String) params.get("cut");
@@ -5594,8 +5596,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CollectionUtils.isNotEmpty(fileList)){ if(CollectionUtils.isNotEmpty(fileList)){
fileList.forEach(file -> { fileList.forEach(file -> {
Map<String,Object> fileMap = new HashMap<>(); Map<String,Object> fileMap = new HashMap<>();
fileMap.put("item.fileName", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : "");
fileMap.put("item.filePath", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : "");
/*fileMap.put("item.fileName", file.getFileName()); /*fileMap.put("item.fileName", file.getFileName());
fileMap.put("item.filePath", file.getUrl());*/ fileMap.put("item.filePath", file.getUrl());*/
dataList.add(fileMap); dataList.add(fileMap);
@@ -5610,11 +5612,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String createTime = sdf.format(processHistory.getCreateTime()); String createTime = sdf.format(processHistory.getCreateTime());
Map<String,Object> designMap = new HashMap<>(); Map<String,Object> designMap = new HashMap<>();
designMap.put("design.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); designMap.put("DESIGN_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : "");
designMap.put("design.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); designMap.put("DESIGN_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : "");
designMap.put("design.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); designMap.put("DESIGN_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : "");
designMap.put("design.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); designMap.put("DESIGN_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :"");
designMap.put("design.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); designMap.put("DESIGN_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : "");
/*designMap.put("design.result", processHistory.getReviewResult()); /*designMap.put("design.result", processHistory.getReviewResult());
designMap.put("design.opinion", processHistory.getApprovalOpinion()); designMap.put("design.opinion", processHistory.getApprovalOpinion());
@@ -5632,11 +5634,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String createTime = sdf.format(processHistory.getCreateTime()); String createTime = sdf.format(processHistory.getCreateTime());
Map<String,Object> verifyMap = new HashMap<>(); Map<String,Object> verifyMap = new HashMap<>();
verifyMap.put("verify.result", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : ""); verifyMap.put("VERIFY_RESULT", StringUtils.isNotEmpty(processHistory.getReviewResult()) ? processHistory.getReviewResult() : "");
verifyMap.put("verify.opinion", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : ""); verifyMap.put("VERIFY_OPINION", StringUtils.isNotEmpty(processHistory.getApprovalOpinion()) ? processHistory.getApprovalOpinion() : "");
verifyMap.put("verify.node", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : ""); verifyMap.put("VERIFY_NODE", StringUtils.isNotEmpty(processHistory.getName()) ? processHistory.getName() : "");
verifyMap.put("verify.operator", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :""); verifyMap.put("VERIFY_OPERATOR", StringUtils.isNotEmpty(processHistory.getAssignee()) ? processHistory.getAssignee() :"");
verifyMap.put("verify.dateTime", StringUtils.isNotEmpty(createTime) ? createTime : ""); verifyMap.put("VERIFY_DATETIME", StringUtils.isNotEmpty(createTime) ? createTime : "");
/*verifyMap.put("verify.result", processHistory.getReviewResult()); /*verifyMap.put("verify.result", processHistory.getReviewResult());
verifyMap.put("verify.opinion", processHistory.getApprovalOpinion()); verifyMap.put("verify.opinion", processHistory.getApprovalOpinion());
jero-boot/jero-boot-single-startup/src/main/resources/exportPdfTemp/ComplianceReportTemplate.docx
BIN
View File
Binary file not shown.