From 56543addb6b50c343763dc27f516fc9e5c865b23 Mon Sep 17 00:00:00 2001
From: chenqi <1799796883@qq.com>
Date: Mon, 1 Feb 2021 18:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java  | 6 +++++-
 .../cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java | 6 +-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a2de850..ff2b2d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <module>wisenergy-web-admin</module>
     </modules>
 
-    <!-- POM属性变量 -->
+    <!--POM属性变量-->
     <properties>
         <!-- 文件拷贝时的编码 -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
index fa33cad..684f3db 100644
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
+++ b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
@@ -58,8 +58,12 @@ public class WorkTimeOrderDto {
     @ApiModelProperty(name = "typeName",value = "项目类型名")
     private String typeName;
 
-    @ApiModelProperty(name = "isOvertime",value = "0:正常工时，1：加班")
+    @ApiModelProperty(name = "isOvertime", value = "0:正常工时，1：加班")
     private Integer isOvertime;
 
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
+    @ApiModelProperty(name = "modifyTime",value = "驳回时间")
+    private Date modifyTime;
+
 
 }
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
index aff11e9..90de045 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
@@ -243,7 +243,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(dto.getUserId()));
             BeanUtils.copyProperties(dto, workTimeOrder);
             totalTime += dto.getWorkTime();
-            if (dto.getWorkId() != null) {
+            if (null != dto.getWorkId()) {
                 WorkTimeOrder workTimeOrder1 = workTimeOrderMapper.selectById(dto.getWorkId());
                 if (2 == workTimeOrder1.getStatus() || 5 == workTimeOrder1.getStatus()) {
                     if (!dto.getStatus().equals(workTimeOrder1.getStatus())) {
@@ -302,8 +302,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     }
 
 
-
-
     // 判断填写工时单是否重复
     private void isRepeat(List<WorkTimeOrderDto> list) {
         if (CollectionUtils.isEmpty(list)) {
@@ -338,7 +336,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         isManager(userId);
         WorkUser user = workUserService.getById(userId);
         // PC端
-
         return pageExamine(user, projectId, type, page, size, status);
     }
 
@@ -632,7 +629,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     }
 
 
-
     // 判断工单是否合法
     private void isEmpty(WorkTimeOrderDto dto) {
         int size = 0;
-- 
2.18.1