法规清单导出
This commit is contained in:
+2
-2
@@ -71,7 +71,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
|
||||
private String serialNumber;
|
||||
|
||||
/**标题*/
|
||||
@Excel(name = "title", width = 20)
|
||||
@Excel(name = "Title", width = 20)
|
||||
@ApiModelProperty(value = "标题")
|
||||
private String title;
|
||||
|
||||
@@ -101,7 +101,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
|
||||
/**适用地区*/
|
||||
@ApiModelProperty(value = "适用地区")
|
||||
@Dict(dicCode ="Area")
|
||||
@Excel(name = "Area", width = 15, dicCode = "region")
|
||||
@Excel(name = "Area", width = 15)
|
||||
private String region;
|
||||
|
||||
/**对应标准*/
|
||||
|
||||
+18
-1
@@ -2929,8 +2929,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
fileTemp.mkdirs();
|
||||
//文件
|
||||
exportFile(dataList,fileInfos);
|
||||
String excelName = "";
|
||||
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
|
||||
excelName = "法规清单.xlsx";
|
||||
}else{
|
||||
excelName = "Regulation List.xlsx";
|
||||
}
|
||||
//excel
|
||||
OutputStream excelOS = new FileOutputStream(path + File.separator + "法规清单.xlsx");
|
||||
OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
|
||||
ExportParams exportParams = new ExportParams();
|
||||
exportParams.setType(ExcelType.XSSF);
|
||||
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
|
||||
@@ -3069,6 +3075,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
if(StringUtils.isNotBlank(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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user