修改后端报错

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgInspectionInfo.java

@@ -49,7 +49,6 @@ public class TzsJgInspectionInfo extends BaseEntity {
 
     @ApiModelProperty(value = "检验日期")
     private Date inspectDate;
-    private String inspectDateStr;
 
     @ApiModelProperty(value = "检验结论(合格，复检合格等)")
     private String inspectConclusion;

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsJgServiceImpl.java

@@ -186,8 +186,11 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		TzsJgProduceInfoDto produceInfoDto = new TzsJgProduceInfoDto();
 		if (produceInfo != null) {
 			BeanUtils.copyProperties(produceInfo, produceInfoDto);
-		
-			produceInfoDto.setProduceDateStr(sdf.format(produceInfoDto.getProduceDate()));
+		    if(produceInfoDto.getProduceDate()!=null) 
+		    {
+		    	produceInfoDto.setProduceDateStr(sdf.format(produceInfoDto.getProduceDate()));
+		    }
+			
 			List<TzsJgFile> produceStandard = iTzsJgFileService
 					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, produceInfo.getSequenceNbr())
 							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
@@ -242,7 +245,11 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		TzsJgUseInfoDto useInfoDto = new TzsJgUseInfoDto();
 		if (useInfo != null) {
 			BeanUtils.copyProperties(useInfo, useInfoDto);
-			useInfoDto.setUseDateStr(sdf.format(useInfoDto.getUseDate()));
+			if(useInfoDto.getUseDate()!=null) 
+			{
+				useInfoDto.setUseDateStr(sdf.format(useInfoDto.getUseDate()));
+			}
+			
 		}
 		TzsJgConstructionInfo constructionInfo = iTzsJgConstructionInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgConstructionInfo>().eq(TzsJgConstructionInfo::getSequenceCode, code)
@@ -259,7 +266,10 @@ public class TzsJgServiceImpl implements ITzsJgService {
 			for (TzsJgConstructionInfo constructionInfoOne : constructionInfoList) {
 				TzsJgConstructionInfoDto constructionInfoDtoOne = new TzsJgConstructionInfoDto();
 				BeanUtils.copyProperties(constructionInfoOne, constructionInfoDtoOne);
-				constructionInfoDtoOne.setUscDateStr(sdf.format(constructionInfoDtoOne.getUscDate()));
+				if(constructionInfoDtoOne.getUscDate()!=null) 
+				{
+					constructionInfoDtoOne.setUscDateStr(sdf.format(constructionInfoDtoOne.getUscDate()));
+				}			
 				constructionInfoDtoList.add(constructionInfoDtoOne);
 			}
 		}
@@ -291,8 +301,12 @@ public class TzsJgServiceImpl implements ITzsJgService {
 						.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.REPAIR_INFORM.getAttribute()));
 				repairInform.forEach(e -> e.setFileUrl(fileServerUrl + e.getFileUrl()));
 				maintenanceInfoDtoOne.setRepairInform(repairInform);
-				maintenanceInfoDtoOne.setInformStartStr(sdf.format(maintenanceInfoDtoOne.getInformStart()));
+				if(maintenanceInfoDtoOne.getInformStart()!=null) {
+					maintenanceInfoDtoOne.setInformStartStr(sdf.format(maintenanceInfoDtoOne.getInformStart()));
+				}
+				if(maintenanceInfoDtoOne.getInformEnd()!=null) {
 				maintenanceInfoDtoOne.setInformEndStr(sdf.format(maintenanceInfoDtoOne.getInformEnd()));
+				}
 				maintenanceInfoDtoList.add(maintenanceInfoDtoOne);
 			}
 		}
@@ -324,8 +338,14 @@ public class TzsJgServiceImpl implements ITzsJgService {
 								.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.INSPECTION_REPORT.getAttribute()));
 				repairInform.forEach(e -> e.setFileUrl(fileServerUrl + e.getFileUrl()));
 				inspectionInfoDtoOne.setInspectionReport(repairInform);
-				inspectionInfoDtoOne.setInspectDateStr(sdf.format(inspectionInfoDtoOne.getInspectDate()));
-				inspectionInfoDtoOne.setNextInspectDateStr(sdf.format(inspectionInfoDtoOne.getNextInspectDate()));
+				if(inspectionInfoDtoOne.getInspectDate()!=null) 
+				{
+					inspectionInfoDtoOne.setInspectDateStr(sdf.format(inspectionInfoDtoOne.getInspectDate()));
+				}
+				if(inspectionInfoDtoOne.getNextInspectDate()!=null) {
+					
+					inspectionInfoDtoOne.setNextInspectDateStr(sdf.format(inspectionInfoDtoOne.getNextInspectDate()));
+				}
 				inspectionInfoDtoList.add(inspectionInfoDtoOne);
 			}
 		}
@@ -335,7 +355,10 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		TzsJgOtherInfoDto otherInfoDto = new TzsJgOtherInfoDto();
 		if (otherInfo != null) {
 			BeanUtils.copyProperties(otherInfo, otherInfoDto);
-			otherInfoDto.setExpiryDateStr(sdf.format(otherInfoDto.getExpiryDate()));
+			if(otherInfoDto.getExpiryDate()!=null) {
+				otherInfoDto.setExpiryDateStr(sdf.format(otherInfoDto.getExpiryDate()));
+			}
+			
 		}
 		TzsJgElevatorTechInfo elevatorTechInfo = iTzsJgElevatorTechInfoService.getOne(
 				new LambdaQueryWrapper<TzsJgElevatorTechInfo>().eq(TzsJgElevatorTechInfo::getSequenceCode, code));