Forráskód Böngészése

修改项目进度计算逻辑修改,新增判空

anderx 1 éve%!(EXTRA string=óta)
szülő
commit
6440e74fe3

+ 4 - 2
src/main/java/com/goafanti/common/model/TaskDetails.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -1176,7 +1178,7 @@ public class TaskDetails implements Serializable {
     public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -1192,7 +1194,7 @@ public class TaskDetails implements Serializable {
     public void setDownloadTime(Date downloadTime) {
         this.downloadTime = downloadTime;
     }
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }

+ 0 - 2
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -67,7 +67,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
         TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
         List<Map<String,Object >> list=new ArrayList<>();
-        if (taskDetails==null){
             List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
             //如果是会员
             TOrderTaskBo thisTask = null;
@@ -93,7 +92,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                     }
                     list.add(map);
                 }
-            }
         }
         if (taskDetails!=null){
             BeanUtils.copyProperties(taskDetails, res);