diff --git a/SynologyDrive/5.模板/ComplianceReportTemplate.docx b/SynologyDrive/5.模板/ComplianceReportTemplate.docx index bb2ddeb81..fdd8cfc19 100644 Binary files a/SynologyDrive/5.模板/ComplianceReportTemplate.docx and b/SynologyDrive/5.模板/ComplianceReportTemplate.docx differ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 86f1e9751..60ff942cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -216,6 +216,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String designInitiator; /**设计符合性确认-发起人id*/ + @TableField(updateStrategy = FieldStrategy.IGNORED) @ApiModelProperty(value = "设计符合性确认-发起人id") private String designInitiatorId; @@ -231,6 +232,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-责任人id*/ @ApiModelProperty(value = "设计符合性确认-责任人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String designDutyId; /**设计符合性确认-责任人名称*/ @@ -274,6 +276,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-发起人id*/ @ApiModelProperty(value = "prehomo确认-发起人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String prehomoInitiatorId; /**prehomo确认-发起人名称*/ @@ -288,6 +291,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-责任人id*/ @ApiModelProperty(value = "prehomo确认-责任人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String prehomoDutyId; /**prehomo确认-责任人名称*/ @@ -331,6 +335,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-发起人id*/ @ApiModelProperty(value = "验证符合性确认-发起人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String verifyInitiatorId; /**验证符合性确认-发起人名称*/ @@ -345,6 +350,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-责任人id*/ @ApiModelProperty(value = "验证符合性确认-责任人id") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String verifyDutyId; /**验证符合性确认-责任人名称*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index c4dbb661c..88dc8747e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1436,11 +1436,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryQueryWrapper = new QueryWrapper<>(); lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); @@ -4415,16 +4415,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); String dutyTerritoryName = ""; - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - dutyTerritoryName = dutyTerritoryDictItemList.stream() - .filter(e -> finalDutyTerritory.contains(e.getItemValue())) - .map(SysDictItem::getItemText) - .collect(Collectors.joining(",")); - }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - dutyTerritoryName = dutyTerritoryDictItemList.stream() - .filter(e -> finalDutyTerritory.contains(e.getItemValue())) - .map(SysDictItem::getEnName) - .collect(Collectors.joining(",")); + if(StringUtils.isNotEmpty(finalDutyTerritory)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + dutyTerritoryName = dutyTerritoryDictItemList.stream() + .filter(e -> finalDutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getItemText) + .collect(Collectors.joining(",")); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + dutyTerritoryName = dutyTerritoryDictItemList.stream() + .filter(e -> finalDutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getEnName) + .collect(Collectors.joining(",")); + } } dataMap.put("RESPONSIBLE_FIELD", StringUtils.isNotEmpty(dutyTerritoryName) ? dutyTerritoryName : ""); @@ -4435,24 +4437,39 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryEngineeringInterfaceUserWrapper = new QueryWrapper<>(); - queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId,engineeringInterfacePerson); - SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper); - dataMap.put("ENGINEERING", StringUtils.isNotEmpty(engineeringInterfaceInfo.getUsername()) ? engineeringInterfaceInfo.getUsername() : ""); + String engineeringInterfaceName = ""; + if(StringUtils.isNotEmpty(engineeringInterfacePerson)){ + QueryWrapper queryEngineeringInterfaceUserWrapper = new QueryWrapper<>(); + queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId,engineeringInterfacePerson); + SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper); + engineeringInterfaceName = engineeringInterfaceInfo.getUsername(); + } + + dataMap.put("ENGINEERING", StringUtils.isNotEmpty(engineeringInterfaceName) ? engineeringInterfaceName : ""); String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId(); - QueryWrapper queryHomologationEngineerUserWrapper = new QueryWrapper<>(); - queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId,homologationEngineerId); - SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper); - dataMap.put("HOMOLOGATION", StringUtils.isNotEmpty(homologationEngineerInfo.getUsername()) ? homologationEngineerInfo.getUsername() : ""); + String homologationEngineerName = ""; + if(StringUtils.isNotEmpty(homologationEngineerId)){ + QueryWrapper queryHomologationEngineerUserWrapper = new QueryWrapper<>(); + queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId,homologationEngineerId); + SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper); + homologationEngineerName = homologationEngineerInfo.getUsername(); + } + dataMap.put("HOMOLOGATION", StringUtils.isNotEmpty(homologationEngineerName) ? homologationEngineerName : ""); String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId(); - QueryWrapper queryRegulationOwnerUserWrapper = new QueryWrapper<>(); - queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId,regulationOwnerId); - SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper); - dataMap.put("REGULATION", StringUtils.isNotEmpty(regulationOwnerInfo.getUsername()) ? regulationOwnerInfo.getUsername() : ""); - + String regulationOwnerName = ""; + if(StringUtils.isNotEmpty(regulationOwnerId)){ + QueryWrapper queryRegulationOwnerUserWrapper = new QueryWrapper<>(); + queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId,regulationOwnerId); + SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper); + regulationOwnerName = regulationOwnerInfo.getUsername(); + } + dataMap.put("REGULATION_ENG", StringUtils.isNotEmpty(regulationOwnerName) ? regulationOwnerName : ""); + log.debug("导出word报告，查询数据结束 ============================================================================="); + log.debug("导出word报告，获取模板开始 ============================================================================="); templateFile = new File(exportPdfTempPath + "temp/ComplianceReportTemplate.docx"); + log.debug("导出word报告，获取模板结束 ============================================================================="); if(templateFile != null){ try { String uuid = UUID.randomUUID().toString(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index 7fdcf6a2d..57113bcd0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -55,6 +55,15 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl updateFeedbackHistoryDataStatusWrapper = new QueryWrapper<>(); + updateFeedbackHistoryDataStatusWrapper.lambda().eq(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackEO.getId()); + updateFeedbackHistoryDataStatusWrapper.lambda().eq(FeedbackHistory::getDataStatus,FeedBackHistoryDataStatusEnum.CUTTENT.getValue()); + feedbackHistoryMapper.update(updateFeedbackHistory,updateFeedbackHistoryDataStatusWrapper); + + //设置历史表数据 + FeedbackHistory feedbackHistory = new FeedbackHistory(); + BeanUtils.copyProperties(projectTaskInventoryFeedbackEO, feedbackHistory); + String id = UUID.randomUUID().toString().replace("-", ""); + feedbackHistory.setId(id); + feedbackHistory.setFeedbackId(projectTaskInventoryFeedbackEO.getId()); + feedbackHistory.setDataStatus(FeedBackHistoryDataStatusEnum.CUTTENT.getValue()); + feedbackHistory.setCreateTime(new Date()); + feedbackHistoryMapper.insert(feedbackHistory); + Date now = new Date(); projectTaskInventoryFeedbackEO.setUpdateTime(now); saveOrUpdate(projectTaskInventoryFeedbackEO); @@ -162,6 +189,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl