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

67717 法规清单-生成合规报告修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-03 14:10:25 +08:00
parent 5bdf965968
commit 7b1c875589
3 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+5 -1
View File
@@ -470,4 +470,8 @@ ALTER TABLE `auth_dummy_inventory_info`
MODIFY COLUMN `config_item` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项' AFTER `inspection_item`,
MODIFY COLUMN `wvta_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID' AFTER `config_item`,
MODIFY COLUMN `duty_territory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域' AFTER `serial_number`,
MODIFY COLUMN `deliverable_template` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`;
MODIFY COLUMN `deliverable_template` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`;
-- 项目库-法规清单，增加字段 流程最后结束的时间（导出合规性报告时使用） 2023-4-03 未同步生产环境
ALTER TABLE `project_laws_inventory`
ADD COLUMN `process_end_time` datetime NULL COMMENT '流程最后结束的时间' AFTER `stand_id`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+6
View File
@@ -505,4 +505,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**设计符合性确认-流程实例id*/
@TableField(exist = false)
private String designPId;
/**流程结束时间 最后的时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "流程结束时间 最后的时间")
private Date processEndTime;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+43 -15
View File
@@ -9280,6 +9280,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
InputStream fin = null;
ServletOutputStream out = null;
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//导出只有英文，去除中英文切换。
params.put("cut",CutEnum.EN.getValue());
String id = (String) params.get("id");
@@ -9290,13 +9292,23 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//查询数据
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id);
ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(lawsInventoryQueryWrapper);
ProjectLawsInventoryEO projectLawsInventory = this.baseMapper.selectOne(lawsInventoryQueryWrapper);
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
projectLawsInventoryEOList.add(projectLawsInventory);
this.dataDispose(
projectLawsInventoryEOList,
currentUser,
Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()),
CutEnum.EN.getValue()
);
ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOList.get(0);
params.put("projectLawsInventoryEO",projectLawsInventoryEO);
QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,id);
ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper);
params.put("projectTaskInventoryEO",projectTaskInventoryEO);
params.put("projectTaskInventoryEO",projectTaskInventoryEO);*/
QueryWrapper<ProjectLibraryBase> libraryBaseQueryWrapper = new QueryWrapper<>();
libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLawsInventoryEO.getProjectLibraryId());
@@ -9314,14 +9326,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
dataMap.put("crNo", String.valueOf(new SimpleDateFormat("yyyyMMddHHmmssSSSS").format(new Date())));
String flowStatus = "";
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyStatus())){
flowStatus = projectTaskInventoryEO.getVerifyStatus() + ",";
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyFlowStatusName())){
flowStatus += projectLawsInventoryEO.getVerifyFlowStatusName() + ",";
}
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getPrehomoStatus())){
flowStatus += projectTaskInventoryEO.getPrehomoStatus() + ",";
}
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getVerifyStatus())){
flowStatus += projectTaskInventoryEO.getVerifyStatus() + ",";
if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignFlowStatusName())){
flowStatus += projectLawsInventoryEO.getDesignFlowStatusName() + ",";
}
if(StringUtils.isNotEmpty(flowStatus)){
flowStatus = flowStatus.substring(0,flowStatus.length() - 1);
@@ -9356,8 +9366,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//对应 np 车型平台
dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
String processEndTimeStr = "";
if(projectTaskInventoryEO.getProcessEndTime() != null){
processEndTimeStr = sdf.format(projectTaskInventoryEO.getProcessEndTime());
// 流程最后结束的时间
if(projectLawsInventoryEO.getProcessEndTime() != null){
processEndTimeStr = sdf.format(projectLawsInventoryEO.getProcessEndTime());
}
dataMap.put("COMPLETION_DATE", StringUtils.isNotEmpty(processEndTimeStr) ? processEndTimeStr : "");
@@ -9446,14 +9457,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(inputStream);
//验证符合性流程实例id
String verifyPId = projectTaskInventoryEO.getVerifyPId();
String verifyPId = projectLawsInventoryEO.getVerifyPId();
//Compliance Attachments 验证符合性流程里最后通过审批的“工程确认”中的附件
setTableContent(1,wordMLPackage,params,verifyPId);
//Validation Compliance Check Approvals（验证符合性确认的审批历史数据）
setTableContent(4,wordMLPackage,params,verifyPId);
//设计符合性流程实例id
String designPId = projectTaskInventoryEO.getDesignPId();
String designPId = projectLawsInventoryEO.getDesignPId();
//Design Compliance Check Approvals （设计符合性确认的审批历史数据)
setTableContent(3,wordMLPackage,params,designPId);
@@ -9529,13 +9540,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
// 设置数据
if(StringUtils.isNotEmpty(pId)){
if(tableIndex == 1){
QueryWrapper<ProjectTaskInventoryFeedbackEO> taskFeedbackQueryWrapper = new QueryWrapper<>();
/*QueryWrapper<ProjectTaskInventoryFeedbackEO> taskFeedbackQueryWrapper = new QueryWrapper<>();
taskFeedbackQueryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,pId);
List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(taskFeedbackQueryWrapper);
if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOList)){
List<String> fileIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getFileId).distinct().collect(Collectors.toList());
String fileId = StringUtils.join(fileIdList,",");
List<OSSFile> fileList = iOSSFileService.getFileInfos(fileId);
if(CollectionUtils.isNotEmpty(fileList)){
fileList.forEach(file -> {
Map<String,Object> fileMap = new HashMap<>();
fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : "");
fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : "");
*//*fileMap.put("item.fileName", file.getFileName());
fileMap.put("item.filePath", file.getUrl());*//*
dataList.add(fileMap);
});
}
}*/
params.put("actiProcInstId",pId);
List<ProcessHistoryEO> processHistoryEOList = processHistoryEOService.queryList(params);
if(CollectionUtils.isNotEmpty(processHistoryEOList)){
List<String> fileIdList = processHistoryEOList.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.toList());
String fileId = StringUtils.join(fileIdList,",");
List<OSSFile> fileList = iOSSFileService.getFileInfos(fileId);
if(CollectionUtils.isNotEmpty(fileList)){
fileList.forEach(file -> {
Map<String,Object> fileMap = new HashMap<>();