diff --git a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java
index b0d39eb..5e02f62 100644
--- a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java
+++ b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java
@@ -115,8 +115,8 @@ public class WorkPermitController extends DafController {
 		if (StringUtil.isNotEmpty(workPermit.getIssuer())) {
 			qw.lambda().like(WorkPermit::getIssuer, workPermit.getIssuer());
 		}
-		//计划开始时间
-		if (StringUtil.isNotEmpty(workPermit.getPlanStartDate())) {
+	//计划开始时间
+		if (null != workPermit.getPlanStartDate()) {
 			qw.lambda().like(WorkPermit::getPlanStartDate, workPermit.getPlanStartDate());
 		}
 		//工作负责人
diff --git a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java
index 43b03f6..f05425e 100644
--- a/src/main/java/org/energy/modules/smart/entity/WorkPermit.java
+++ b/src/main/java/org/energy/modules/smart/entity/WorkPermit.java
@@ -1,9 +1,13 @@
 package org.energy.modules.smart.entity;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -108,12 +112,14 @@ public class WorkPermit extends BaseEntity {
      * 计划开始时间
      */
     @ApiModelProperty(value = "计划开始时间")
-    private String planStartDate;
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime planStartDate;
     /**
      * 计划结束时间
      */
     @ApiModelProperty(value = "计划结束时间")
-    private String planEndDate;
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime planEndDate;
     /**
      * 工作条件
      */
@@ -123,7 +129,8 @@ public class WorkPermit extends BaseEntity {
      * 实际结束时间
      */
     @ApiModelProperty(value = "实际结束时间")
-    private String actualEndDate;
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime actualEndDate;
     /**
      * 是否延期
      */
@@ -134,7 +141,8 @@ public class WorkPermit extends BaseEntity {
      * 计划延期时间
      */
     @ApiModelProperty(value = "计划延期时间")
-    private String plannedExtensionDate;
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime plannedExtensionDate;
     /**
      * 延期申请理由
      */
@@ -159,6 +167,7 @@ public class WorkPermit extends BaseEntity {
     /**
      * 工作状态
      */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
     @ApiModelProperty(value = "工作状态")
     private Integer workState;