修改页面日期显示

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgConstructionInfoDto.java

@@ -58,6 +58,8 @@ public class TzsJgConstructionInfoDto extends BaseDto {
 	 * 施工时间
 	 */
 	private Date uscDate;
+	
+	private String uscDateStr;
 	@ApiModelProperty(value = "同步时间")
 	/**
 	 * 同步时间

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgInspectionInfoDto.java

@@ -68,6 +68,7 @@ public class TzsJgInspectionInfoDto extends BaseDto {
 	 * 检验日期
 	 */
 	private Date inspectDate;
+    private String inspectDateStr;
 	@ApiModelProperty(value = "检验结论(合格，复检合格等)")
 	/**
 	 * 检验结论(合格，复检合格等)
@@ -88,6 +89,7 @@ public class TzsJgInspectionInfoDto extends BaseDto {
 	 * 下次检验日期
 	 */
 	private Date nextInspectDate;
+	private String nextInspectDateStr;
 	@ApiModelProperty(value = "同步时间")
 	/**
 	 * 同步时间

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgMaintenanceInfoDto.java

@@ -55,11 +55,13 @@ public class TzsJgMaintenanceInfoDto extends BaseDto {
 	 * 维保合同开始日期
 	 */
 	private Date informStart;
+	private String informStartStr;
 	@ApiModelProperty(value = "维保合同结束日期")
 	/**
 	 * 维保合同结束日期
 	 */
 	private Date informEnd;
+	private String informEndStr;
 	@ApiModelProperty(value = "维保负责人姓名")
 	/**
 	 * 维保负责人姓名

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgOtherInfoDto.java

@@ -42,6 +42,7 @@ public class TzsJgOtherInfoDto extends BaseDto {
     * 保险到期日
     */
     private Date expiryDate;
+    private String  expiryDateStr;
             @ApiModelProperty(value = "物联网机构（非必填）")
     /**
     * 物联网机构（非必填）

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

@@ -49,6 +49,7 @@ 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

@@ -259,6 +259,7 @@ public class TzsJgServiceImpl implements ITzsJgService {
 			for (TzsJgConstructionInfo constructionInfoOne : constructionInfoList) {
 				TzsJgConstructionInfoDto constructionInfoDtoOne = new TzsJgConstructionInfoDto();
 				BeanUtils.copyProperties(constructionInfoOne, constructionInfoDtoOne);
+				constructionInfoDtoOne.setUscDateStr(sdf.format(constructionInfoDtoOne.getUscDate()));
 				constructionInfoDtoList.add(constructionInfoDtoOne);
 			}
 		}
@@ -290,6 +291,8 @@ 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()));
+				maintenanceInfoDtoOne.setInformEndStr(sdf.format(maintenanceInfoDtoOne.getInformEnd()));
 				maintenanceInfoDtoList.add(maintenanceInfoDtoOne);
 			}
 		}
@@ -321,6 +324,8 @@ 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()));
 				inspectionInfoDtoList.add(inspectionInfoDtoOne);
 			}
 		}
@@ -330,6 +335,7 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		TzsJgOtherInfoDto otherInfoDto = new TzsJgOtherInfoDto();
 		if (otherInfo != null) {
 			BeanUtils.copyProperties(otherInfo, otherInfoDto);
+			otherInfoDto.setExpiryDateStr(sdf.format(otherInfoDto.getExpiryDate()));
 		}
 		TzsJgElevatorTechInfo elevatorTechInfo = iTzsJgElevatorTechInfoService.getOne(
 				new LambdaQueryWrapper<TzsJgElevatorTechInfo>().eq(TzsJgElevatorTechInfo::getSequenceCode, code));