危大工程修改

This commit is contained in:
pengjie 2024-05-10 20:32:09 +08:00
parent 733fbf7cb6
commit 4321cbd179

View File

@ -129,7 +129,7 @@ public class DangerousEngineeringRecordController {
List<Long> controlIds = dangerousEngineeringTypeDescribeControlService.list(Wrappers.<DangerousEngineeringTypeDescribeControl>lambdaQuery() List<Long> controlIds = dangerousEngineeringTypeDescribeControlService.list(Wrappers.<DangerousEngineeringTypeDescribeControl>lambdaQuery()
.in(DangerousEngineeringTypeDescribeControl::getDescribeId, descIds)).stream().map(d -> d.getControlId()).collect(Collectors.toList()); .in(DangerousEngineeringTypeDescribeControl::getDescribeId, descIds)).stream().map(d -> d.getControlId()).collect(Collectors.toList());
DangerousEngineeringType engineeringType = dangerousEngineeringTypeService.getById(typeDescribes.get(0).getTypeId()); DangerousEngineeringType engineeringType = dangerousEngineeringTypeService.getById(typeDescribes.get(0).getTypeId());
List<String> buildTime = (List<String>) map.get("buildStartTime"); // List<String> buildTime = (List<String>) map.get("buildStartTime");
List<String> planTime = (List<String>) map.get("planStartTime"); List<String> planTime = (List<String>) map.get("planStartTime");
DangerousEngineeringRecord dangerousEngineeringRecord = new DangerousEngineeringRecord(); DangerousEngineeringRecord dangerousEngineeringRecord = new DangerousEngineeringRecord();
dangerousEngineeringRecord.setConstructionLocation(MapUtils.getString(map, "constructionLocation")); dangerousEngineeringRecord.setConstructionLocation(MapUtils.getString(map, "constructionLocation"));
@ -139,8 +139,8 @@ public class DangerousEngineeringRecordController {
dangerousEngineeringRecord.setPersonLiableId(systemUser.getUserId()); dangerousEngineeringRecord.setPersonLiableId(systemUser.getUserId());
dangerousEngineeringRecord.setEngineeringTypeId(engineeringType.getId()); dangerousEngineeringRecord.setEngineeringTypeId(engineeringType.getId());
dangerousEngineeringRecord.setEngineeringTypeName(engineeringType.getTypeName()); dangerousEngineeringRecord.setEngineeringTypeName(engineeringType.getTypeName());
dangerousEngineeringRecord.setBuildStartTime(buildTime.get(0)); // dangerousEngineeringRecord.setBuildStartTime(buildTime.get(0));
dangerousEngineeringRecord.setBuildEndTime(buildTime.get(1)); // dangerousEngineeringRecord.setBuildEndTime(buildTime.get(1));
dangerousEngineeringRecord.setPlanStartTime(planTime== null ? null : planTime.get(0)); dangerousEngineeringRecord.setPlanStartTime(planTime== null ? null : planTime.get(0));
dangerousEngineeringRecord.setPlanEndTime(planTime == null ? null : planTime.get(1)); dangerousEngineeringRecord.setPlanEndTime(planTime == null ? null : planTime.get(1));
dangerousEngineeringRecord.setResponsibilityCompanyId(enterpriseInfo.getId()); dangerousEngineeringRecord.setResponsibilityCompanyId(enterpriseInfo.getId());