xiachuang 1 anno fa
parent
commit
bed248ea94

+ 19 - 0
src/main/java/com/palmnest/application/dto/output/AirConditionerAddTimeOutDto.java

@@ -49,6 +49,9 @@ public class AirConditionerAddTimeOutDto {
 	private Integer isLastAuditStep = 0 ;//是否审批的最后一步
 	
 	private List<GoodsOperateDto> operateDto; //审批记录
+
+	private Date useStartTime;		//使用开始时间
+	private Date useEndTime;		//使用结束时间
 	
 	public String getVirtualName() {
 		return virtualName;
@@ -261,4 +264,20 @@ public class AirConditionerAddTimeOutDto {
 	public void setLoginName(String loginName) {
 		this.loginName = loginName;
 	}
+
+	public Date getUseStartTime() {
+		return useStartTime;
+	}
+
+	public void setUseStartTime(Date useStartTime) {
+		this.useStartTime = useStartTime;
+	}
+
+	public Date getUseEndTime() {
+		return useEndTime;
+	}
+
+	public void setUseEndTime(Date useEndTime) {
+		this.useEndTime = useEndTime;
+	}
 }

+ 2 - 0
src/main/java/com/palmnest/service/estateserve/airconditioner/impl/ConditionerAddTimeServiceImpl.java

@@ -779,6 +779,8 @@ public class ConditionerAddTimeServiceImpl implements ConditionerAddTimeService
             }
         }
 
+        dto.setUseStartTime(addTime.getUseStartTime());
+        dto.setUseEndTime(addTime.getUseEndTime());
 
         return dto;
     }