anderx 1 год назад
Родитель
Сommit
774063186b

+ 4 - 1
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;
@@ -1008,7 +1010,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;
     }
@@ -1025,6 +1027,7 @@ public class TaskDetails implements Serializable {
         this.downloadTime = downloadTime;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }

+ 18 - 10
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -15,10 +15,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 项目申报详情(TaskDetails)表服务实现类
@@ -54,11 +51,24 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
 
     @Override
     public Object getByTid(Integer id) {
-        TaskDetails taskDetails = queryById(id);
-        TaskDetailsBo res = new TaskDetailsBo();
-        BeanUtils.copyProperties(taskDetails, res);
         TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
         TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
+        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
+        TaskDetails taskDetails=new TaskDetails();
+        //如果是会员
+        if (mid.getProjectType()==1){
+            List<TOrderTaskBo> list =new ArrayList<>();
+            for (TOrderTaskBo e : tOrderTaskBos) {
+                //
+                if (e.getcSort()==6){
+                     taskDetails = queryById(id);
+                    if (taskDetails!=null) break;
+                }
+            }
+        }
+
+        TaskDetailsBo res = new TaskDetailsBo();
+        BeanUtils.copyProperties(taskDetails, res);
         BigDecimal totalAmount = tOrderNew.getTotalAmount();
         String lvl=null;
         if (totalAmount.compareTo(new BigDecimal("3"))<0){
@@ -72,10 +82,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         res.setContractNo(tOrderNew.getContractNo());
         res.setMemberStatus(mid.getProjectType());
         res.setMemberLvl(lvl);
-        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
-        res.setTaskList(tOrderTaskBos);
-
 
+        res.setTaskList(tOrderTaskBos);
         return res;
     }