Commit cd69ad0f authored by mengmeng's avatar mengmeng

modify timeManage interface

parent a2c44eac
...@@ -23,10 +23,10 @@ public class AppointmentTimeManageDTO implements Serializable { ...@@ -23,10 +23,10 @@ public class AppointmentTimeManageDTO implements Serializable {
private Long id; private Long id;
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
private Date startTime; private String startTime;
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
private Date endTime; private String endTime;
@ApiModelProperty(value = "时间类型") @ApiModelProperty(value = "时间类型")
private String timeType; private String timeType;
...@@ -38,4 +38,4 @@ public class AppointmentTimeManageDTO implements Serializable { ...@@ -38,4 +38,4 @@ public class AppointmentTimeManageDTO implements Serializable {
private String useState; private String useState;
} }
\ No newline at end of file
...@@ -22,11 +22,11 @@ public class AppointmentTimeManageEntity extends BaseEntity { ...@@ -22,11 +22,11 @@ public class AppointmentTimeManageEntity extends BaseEntity {
/** /**
* 开始时间 * 开始时间
*/ */
private Date startTime; private String startTime;
/** /**
* 结束时间 * 结束时间
*/ */
private Date endTime; private String endTime;
/** /**
* 时间类型 * 时间类型
*/ */
...@@ -39,4 +39,4 @@ public class AppointmentTimeManageEntity extends BaseEntity { ...@@ -39,4 +39,4 @@ public class AppointmentTimeManageEntity extends BaseEntity {
* 使用状态 1 正在使用; 2 未使用 * 使用状态 1 正在使用; 2 未使用
*/ */
private String useState; private String useState;
} }
\ No newline at end of file
...@@ -16,9 +16,9 @@ public class AppointmentTimeManageExcel { ...@@ -16,9 +16,9 @@ public class AppointmentTimeManageExcel {
@Excel(name = "主键ID") @Excel(name = "主键ID")
private Long id; private Long id;
@Excel(name = "开始时间") @Excel(name = "开始时间")
private Date startTime; private String startTime;
@Excel(name = "结束时间") @Excel(name = "结束时间")
private Date endTime; private String endTime;
@Excel(name = "时间类型") @Excel(name = "时间类型")
private String timeType; private String timeType;
@Excel(name = "时间间隔") @Excel(name = "时间间隔")
...@@ -26,4 +26,4 @@ public class AppointmentTimeManageExcel { ...@@ -26,4 +26,4 @@ public class AppointmentTimeManageExcel {
@Excel(name = "使用状态 1 正在使用; 2 未使用") @Excel(name = "使用状态 1 正在使用; 2 未使用")
private String useState; private String useState;
} }
\ No newline at end of file
...@@ -40,7 +40,7 @@ public class AppointmentTimeManageController { ...@@ -40,7 +40,7 @@ public class AppointmentTimeManageController {
@GetMapping("getTime") @GetMapping("getTime")
@ApiOperation("获取当前正使用的时间段") @ApiOperation("获取当前正使用的时间段")
public Result<AppointmentTimeManageDTO> getTime(@PathVariable("id") Long id){ public Result<AppointmentTimeManageDTO> getTime(){
AppointmentTimeManageDTO data = appointmentTimeManageService.getByUseState(); AppointmentTimeManageDTO data = appointmentTimeManageService.getByUseState();
return new Result<AppointmentTimeManageDTO>().ok(data); return new Result<AppointmentTimeManageDTO>().ok(data);
......
...@@ -23,10 +23,10 @@ public class AppointmentTimeManageDTO implements Serializable { ...@@ -23,10 +23,10 @@ public class AppointmentTimeManageDTO implements Serializable {
private Long id; private Long id;
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
private Date startTime; private String startTime;
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
private Date endTime; private String endTime;
@ApiModelProperty(value = "时间类型") @ApiModelProperty(value = "时间类型")
private String timeType; private String timeType;
...@@ -38,4 +38,4 @@ public class AppointmentTimeManageDTO implements Serializable { ...@@ -38,4 +38,4 @@ public class AppointmentTimeManageDTO implements Serializable {
private String useState; private String useState;
} }
\ No newline at end of file
...@@ -22,11 +22,11 @@ public class AppointmentTimeManageEntity extends BaseEntity { ...@@ -22,11 +22,11 @@ public class AppointmentTimeManageEntity extends BaseEntity {
/** /**
* 开始时间 * 开始时间
*/ */
private Date startTime; private String startTime;
/** /**
* 结束时间 * 结束时间
*/ */
private Date endTime; private String endTime;
/** /**
* 时间类型 * 时间类型
*/ */
...@@ -39,4 +39,4 @@ public class AppointmentTimeManageEntity extends BaseEntity { ...@@ -39,4 +39,4 @@ public class AppointmentTimeManageEntity extends BaseEntity {
* 使用状态 1 正在使用; 2 未使用 * 使用状态 1 正在使用; 2 未使用
*/ */
private String useState; private String useState;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment