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

法规清单-导出word报告完善。

Browse Source 
法规清单-编辑流程 发起人 责任人  设置空值。
设计、验证、prehomo 责任人填写工程交付增加历史。
This commit is contained in:
wangzhijiang
2022-05-29 11:12:15 +08:00
parent c577d1260b
commit 215dfa906a
5 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SynologyDrive/5.模板/ComplianceReportTemplate.docx
BIN
View File
Binary file not shown.
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+6
View File
@@ -216,6 +216,7 @@ public class ProjectLawsInventoryEO implements Serializable {
private String designInitiator; private String designInitiator;
/**设计符合性确认-发起人id*/ /**设计符合性确认-发起人id*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "设计符合性确认-发起人id") @ApiModelProperty(value = "设计符合性确认-发起人id")
private String designInitiatorId; private String designInitiatorId;
@@ -231,6 +232,7 @@ public class ProjectLawsInventoryEO implements Serializable {
/**设计符合性确认-责任人id*/ /**设计符合性确认-责任人id*/
@ApiModelProperty(value = "设计符合性确认-责任人id") @ApiModelProperty(value = "设计符合性确认-责任人id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String designDutyId; private String designDutyId;
/**设计符合性确认-责任人名称*/ /**设计符合性确认-责任人名称*/
@@ -274,6 +276,7 @@ public class ProjectLawsInventoryEO implements Serializable {
/**prehomo确认-发起人id*/ /**prehomo确认-发起人id*/
@ApiModelProperty(value = "prehomo确认-发起人id") @ApiModelProperty(value = "prehomo确认-发起人id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String prehomoInitiatorId; private String prehomoInitiatorId;
/**prehomo确认-发起人名称*/ /**prehomo确认-发起人名称*/
@@ -288,6 +291,7 @@ public class ProjectLawsInventoryEO implements Serializable {
/**prehomo确认-责任人id*/ /**prehomo确认-责任人id*/
@ApiModelProperty(value = "prehomo确认-责任人id") @ApiModelProperty(value = "prehomo确认-责任人id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String prehomoDutyId; private String prehomoDutyId;
/**prehomo确认-责任人名称*/ /**prehomo确认-责任人名称*/
@@ -331,6 +335,7 @@ public class ProjectLawsInventoryEO implements Serializable {
/**验证符合性确认-发起人id*/ /**验证符合性确认-发起人id*/
@ApiModelProperty(value = "验证符合性确认-发起人id") @ApiModelProperty(value = "验证符合性确认-发起人id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String verifyInitiatorId; private String verifyInitiatorId;
/**验证符合性确认-发起人名称*/ /**验证符合性确认-发起人名称*/
@@ -345,6 +350,7 @@ public class ProjectLawsInventoryEO implements Serializable {
/**验证符合性确认-责任人id*/ /**验证符合性确认-责任人id*/
@ApiModelProperty(value = "验证符合性确认-责任人id") @ApiModelProperty(value = "验证符合性确认-责任人id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String verifyDutyId; private String verifyDutyId;
/**验证符合性确认-责任人名称*/ /**验证符合性确认-责任人名称*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+43 -26
View File
@@ -1436,11 +1436,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) { } else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
userIdList.add(engineeringInterfacePerson); userIdList.add(engineeringInterfacePerson);
msgContentEN = sysUser.getUsername() + " has returned the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() msgContentEN = sysUser.getUsername() + " has returned the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+ ".the due date is " +taskAffirmDueDate+ " Please check and handle it in time."; + ".The due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) { } else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
userIdList.add(engineeringInterfacePerson); userIdList.add(engineeringInterfacePerson);
msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+ ".the due date is " +taskAffirmDueDate+ " Please check and handle it in time."; + ".The due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
} }
if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){ if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
@@ -4336,7 +4336,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String cut = (String) params.get("cut"); String cut = (String) params.get("cut");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
log.debug("导出word报告，查询数据开始 =============================================================================");
//查询数据 //查询数据
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>(); QueryWrapper<ProjectLawsInventoryEO> lawsInventoryQueryWrapper = new QueryWrapper<>();
lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id);
@@ -4415,16 +4415,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String finalDutyTerritory = dutyTerritory; String finalDutyTerritory = dutyTerritory;
List<SysDictItem> dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); List<SysDictItem> dutyTerritoryDictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory");
String dutyTerritoryName = ""; String dutyTerritoryName = "";
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(StringUtils.isNotEmpty(finalDutyTerritory)){
dutyTerritoryName = dutyTerritoryDictItemList.stream() if(StringUtils.equals(cut,CutEnum.CN.getValue())){
.filter(e -> finalDutyTerritory.contains(e.getItemValue())) dutyTerritoryName = dutyTerritoryDictItemList.stream()
.map(SysDictItem::getItemText) .filter(e -> finalDutyTerritory.contains(e.getItemValue()))
.collect(Collectors.joining(",")); .map(SysDictItem::getItemText)
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ .collect(Collectors.joining(","));
dutyTerritoryName = dutyTerritoryDictItemList.stream() }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
.filter(e -> finalDutyTerritory.contains(e.getItemValue())) dutyTerritoryName = dutyTerritoryDictItemList.stream()
.map(SysDictItem::getEnName) .filter(e -> finalDutyTerritory.contains(e.getItemValue()))
.collect(Collectors.joining(",")); .map(SysDictItem::getEnName)
.collect(Collectors.joining(","));
}
} }
dataMap.put("RESPONSIBLE_FIELD", StringUtils.isNotEmpty(dutyTerritoryName) ? dutyTerritoryName : ""); dataMap.put("RESPONSIBLE_FIELD", StringUtils.isNotEmpty(dutyTerritoryName) ? dutyTerritoryName : "");
@@ -4435,24 +4437,39 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
dataMap.put("STUDIO", StringUtils.isNotEmpty(studioUserInfo.getUsername()) ? studioUserInfo.getUsername() : ""); dataMap.put("STUDIO", StringUtils.isNotEmpty(studioUserInfo.getUsername()) ? studioUserInfo.getUsername() : "");
String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson(); String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
QueryWrapper<SysUser> queryEngineeringInterfaceUserWrapper = new QueryWrapper<>(); String engineeringInterfaceName = "";
queryEngineeringInterfaceUserWrapper.lambda().eq(SysUser::getId,engineeringInterfacePerson); if(StringUtils.isNotEmpty(engineeringInterfacePerson)){
SysUser engineeringInterfaceInfo = sysUserMapper.selectOne(queryEngineeringInterfaceUserWrapper); QueryWrapper<SysUser> queryEngineeringInterfaceUserWrapper = new QueryWrapper<>();
dataMap.put("ENGINEERING", StringUtils.isNotEmpty(engineeringInterfaceInfo.getUsername()) ? engineeringInterfaceInfo.getUsername() : ""); 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(); String homologationEngineerId = projectLawsInventoryEO.getHomologationEngineerId();
QueryWrapper<SysUser> queryHomologationEngineerUserWrapper = new QueryWrapper<>(); String homologationEngineerName = "";
queryHomologationEngineerUserWrapper.lambda().eq(SysUser::getId,homologationEngineerId); if(StringUtils.isNotEmpty(homologationEngineerId)){
SysUser homologationEngineerInfo = sysUserMapper.selectOne(queryHomologationEngineerUserWrapper); QueryWrapper<SysUser> queryHomologationEngineerUserWrapper = new QueryWrapper<>();
dataMap.put("HOMOLOGATION", StringUtils.isNotEmpty(homologationEngineerInfo.getUsername()) ? homologationEngineerInfo.getUsername() : ""); 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(); String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
QueryWrapper<SysUser> queryRegulationOwnerUserWrapper = new QueryWrapper<>(); String regulationOwnerName = "";
queryRegulationOwnerUserWrapper.lambda().eq(SysUser::getId,regulationOwnerId); if(StringUtils.isNotEmpty(regulationOwnerId)){
SysUser regulationOwnerInfo = sysUserMapper.selectOne(queryRegulationOwnerUserWrapper); QueryWrapper<SysUser> queryRegulationOwnerUserWrapper = new QueryWrapper<>();
dataMap.put("REGULATION", StringUtils.isNotEmpty(regulationOwnerInfo.getUsername()) ? regulationOwnerInfo.getUsername() : ""); 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"); templateFile = new File(exportPdfTempPath + "temp/ComplianceReportTemplate.docx");
log.debug("导出word报告，获取模板结束 =============================================================================");
if(templateFile != null){ if(templateFile != null){
try { try {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+28
View File
@@ -55,6 +55,15 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
String serialNumber = createSerialNumber(); String serialNumber = createSerialNumber();
projectTaskInventoryFeedbackEO.setSerialNumber(serialNumber); projectTaskInventoryFeedbackEO.setSerialNumber(serialNumber);
save(projectTaskInventoryFeedbackEO); save(projectTaskInventoryFeedbackEO);
//设置历史表数据
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());
feedbackHistoryMapper.insert(feedbackHistory);
} }
/** /**
@@ -65,6 +74,24 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
*/ */
@Override @Override
public void editById(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO) { public void editById(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO) {
//把历史表中的数据为'当前'的 ， 更新为'历史'
FeedbackHistory updateFeedbackHistory = new FeedbackHistory();
updateFeedbackHistory.setDataStatus(FeedBackHistoryDataStatusEnum.HISTORY.getValue());
QueryWrapper<FeedbackHistory> 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(); Date now = new Date();
projectTaskInventoryFeedbackEO.setUpdateTime(now); projectTaskInventoryFeedbackEO.setUpdateTime(now);
saveOrUpdate(projectTaskInventoryFeedbackEO); saveOrUpdate(projectTaskInventoryFeedbackEO);
@@ -162,6 +189,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
feedbackHistory.setId(id); feedbackHistory.setId(id);
feedbackHistory.setFeedbackId(projectTaskInventoryFeedbackEO.getId()); feedbackHistory.setFeedbackId(projectTaskInventoryFeedbackEO.getId());
feedbackHistory.setDataStatus(FeedBackHistoryDataStatusEnum.CUTTENT.getValue()); feedbackHistory.setDataStatus(FeedBackHistoryDataStatusEnum.CUTTENT.getValue());
feedbackHistory.setCreateTime(new Date());
feedbackHistoryMapper.insert(feedbackHistory); feedbackHistoryMapper.insert(feedbackHistory);
this.baseMapper.updateById(projectTaskInventoryFeedbackEO); this.baseMapper.updateById(projectTaskInventoryFeedbackEO);
jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml
+5 -1
View File
@@ -187,6 +187,10 @@ jero :
upload: /data/DeploymentPackage/laws_weilai/upFiles upload: /data/DeploymentPackage/laws_weilai/upFiles
#webapp文件路径 #webapp文件路径
webapp: /data/DeploymentPackage/laws_weilai/webapp webapp: /data/DeploymentPackage/laws_weilai/webapp
#导出word报告模板存放路径
exportPdfTempPath: /data/DeploymentPackage/laws_weilai/exportPdfTemp/
#仿宋体字体文件路径 设置
simfangFontFilePath: /data/DeploymentPackage/laws_weilai/simfangFontFilePath//simfang.ttf
shiro: shiro:
excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储配置 #阿里云oss存储配置
@@ -363,4 +367,4 @@ opensso:
# 测试 TEST版 # 测试 TEST版
redirectUri: http%3A%2F%2F139.9.235.66%3A8010 redirectUri: http%3A%2F%2F139.9.235.66%3A8010
local-tool: local-tool:
uri: http://139.9.235.66:9022 uri: http://139.9.235.66:9022