日期格式不要时分秒

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/entity/CostInfoEntity.java

@@ -1,8 +1,15 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.entity;
 
-import javax.persistence.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Objects;
 
@@ -20,9 +27,11 @@ public class CostInfoEntity {
     private String costStatus;
     private String relevanceUser;
     private BigDecimal performAmount;
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date happenDate;
     private String projectName;
     private String proposer;
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date paymentDate;
     private Integer applyCostId;
     private Date createDate;

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/entity/ManHourInfoEntity.java

@@ -1,10 +1,16 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.entity;
 
-import javax.persistence.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @author
@@ -104,10 +110,12 @@ public class ManHourInfoEntity {
 
     @Basic
     @Column(name = "manufacture_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getManufactureDate() {
         return manufactureDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setManufactureDate(Date manufactureDate) {
         this.manufactureDate = manufactureDate;
     }
@@ -216,10 +224,12 @@ public class ManHourInfoEntity {
 
     @Basic
     @Column(name = "start_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getStartDate() {
         return startDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setStartDate(Date startDate) {
         this.startDate = startDate;
     }
@@ -237,10 +247,12 @@ public class ManHourInfoEntity {
 
     @Basic
     @Column(name = "end_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getEndDate() {
         return endDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/entity/PurchaseInfoEntity.java

@@ -1,6 +1,14 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.entity;
 
-import javax.persistence.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -21,6 +29,7 @@ public class PurchaseInfoEntity {
     /**
      * 采购日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date purchaseDate;
     /**
      * 采购信息
@@ -88,6 +97,7 @@ public class PurchaseInfoEntity {
 
     @Basic
     @Column(name = "purchase_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getPurchaseDate() {
         return purchaseDate;
     }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ManHourServiceImpl.java

@@ -11,11 +11,17 @@ import com.ankaibei.workFlow.common.flow.dto.FlowTaskCommentDto;
 import com.ankaibei.workFlow.common.flow.model.FlowEntry;
 import com.ankaibei.workFlow.common.flow.model.FlowEntryPublish;
 import com.ankaibei.workFlow.common.flow.vo.TaskInfoVo;
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.*;
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.ManHourInfoEntity;
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.ProjectInfoEntity;
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.TaskInfoEntity;
+import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
 import com.ankaibei.workFlow.webadmin.ankaibei.enums.CodeEnum;
 import com.ankaibei.workFlow.webadmin.ankaibei.enums.DataIsDeleteEnum;
 import com.ankaibei.workFlow.webadmin.ankaibei.enums.ManHourStatus;
-import com.ankaibei.workFlow.webadmin.ankaibei.mapper.*;
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.ManHourMapper;
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.ProjectInfoMapper;
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.TaskInfoMapper;
+import com.ankaibei.workFlow.webadmin.ankaibei.mapper.UserInfoMapper;
 import com.ankaibei.workFlow.webadmin.ankaibei.service.ManHourService;
 import com.ankaibei.workFlow.webadmin.ankaibei.utils.FlowTaskStart;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ManHourInfoVo;
@@ -27,12 +33,14 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.ManHourInfoEntity;
-import com.ankaibei.workFlow.webadmin.ankaibei.entity.TaskInfoEntity;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author lwq
@@ -70,15 +78,16 @@ public class ManHourServiceImpl implements ManHourService {
         List<TaskInfoEntity> finishedTasks = taskInfoMapper.findAllByTaskParticipantContainsAndTaskStatusEqualsAndIsDeleteEquals(userId, String.valueOf(FlowTaskStatus.FINISHED), (DataIsDeleteEnum.NORMAL.getCode()));
         return new ResMsg(CodeEnum.OK, ResMsg.getMap(manHourAll.map(map -> {
             Map<Object, Object> map1 = new HashMap<>(map);
+            //匹配任务信息
             for (TaskInfoEntity taskInfo : finishedTasks) {
-                if (map1.get("taskId").equals(taskInfo.getTaskId())) {
+                if (map1.get("taskId").equals(taskInfo.getTaskId().toString())) {
                     map1.put("targetTask", taskInfo.getTargetTask());
                     break;
                 }
             }
             String projectId = map.get("projectId");
             for (ProjectInfoEntity projectInfo : projectInfos) {
-                if (Integer.valueOf(projectId).equals(projectInfo.getProjectId())) {
+                if (Integer.valueOf(projectId) == (projectInfo.getProjectId())) {
                     map1.put("projectName", projectInfo.getProjectName());
                     break;
                 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/vo/ManHourInfoVo.java

@@ -1,5 +1,6 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -59,6 +60,7 @@ public class ManHourInfoVo extends BaseVo {
     /**
      * 工时日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date manufactureDate;
 
     /**
@@ -142,22 +144,27 @@ public class ManHourInfoVo extends BaseVo {
         this.taskId = taskId;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getStartDate() {
         return startDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setStartDate(Date startDate) {
         this.startDate = startDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getEndDate() {
         return endDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getManufactureDate() {
         return manufactureDate;
     }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/vo/ManHourJobVo.java

@@ -1,14 +1,8 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -35,6 +29,7 @@ public class ManHourJobVo {
     private String jobContent;
 
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getManufactureDate() {
         return manufactureDate;
     }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/vo/PurchaseInfoVo.java

@@ -1,10 +1,9 @@
 package com.ankaibei.workFlow.webadmin.ankaibei.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -27,6 +26,7 @@ public class PurchaseInfoVo extends BaseVo {
     /**
      * 采购日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date purchaseDate;
     /**
      * 采购信息