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

法规清单导出

Browse Source
This commit is contained in:
zhn
2022-06-23 16:22:30 +08:00
parent 49ab70fdbd
commit 5a891e63b6
2 changed files with 20 additions and 3 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/entity/ProjectLawsInventoryEOEn.java
+2 -2
View File
@@ -71,7 +71,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
private String serialNumber; private String serialNumber;
/**标题*/ /**标题*/
@Excel(name = "title", width = 20) @Excel(name = "Title", width = 20)
@ApiModelProperty(value = "标题") @ApiModelProperty(value = "标题")
private String title; private String title;
@@ -101,7 +101,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
/**适用地区*/ /**适用地区*/
@ApiModelProperty(value = "适用地区") @ApiModelProperty(value = "适用地区")
@Dict(dicCode ="Area") @Dict(dicCode ="Area")
@Excel(name = "Area", width = 15, dicCode = "region") @Excel(name = "Area", width = 15)
private String region; private String region;
/**对应标准*/ /**对应标准*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+18 -1
View File
@@ -2929,8 +2929,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
fileTemp.mkdirs(); fileTemp.mkdirs();
//文件 //文件
exportFile(dataList,fileInfos); exportFile(dataList,fileInfos);
String excelName = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
excelName = "法规清单.xlsx";
}else{
excelName = "Regulation List.xlsx";
}
//excel //excel
OutputStream excelOS = new FileOutputStream(path + File.separator + "法规清单.xlsx"); OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
ExportParams exportParams = new ExportParams(); ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF); exportParams.setType(ExcelType.XSSF);
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
@@ -3069,6 +3075,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(StringUtils.isNotBlank(pullVerifyDeliverableType)){ if(StringUtils.isNotBlank(pullVerifyDeliverableType)){
projectLawsInventoryEOEn.setVerifyDeliverableType(pullVerifyDeliverableType); projectLawsInventoryEOEn.setVerifyDeliverableType(pullVerifyDeliverableType);
} }
//清单确认状态
String inventoryAffirmStatus = projectLawsInventoryEOEn.getInventoryAffirmStatus();
if(StringUtils.isNotBlank(inventoryAffirmStatus)){
projectLawsInventoryEOEn.setInventoryAffirmStatusName(inventoryAffirmStatus);
}
//任务确认状态
String taskAffirmStatus = projectLawsInventoryEOEn.getTaskAffirmStatus();
if(StringUtils.isNotBlank(taskAffirmStatus)){
projectLawsInventoryEOEn.setTaskAffirmStatusName(taskAffirmStatus);
}
} }
} }