Browse Source

新增 计算研发预算完成进度

anderx 1 year ago
parent
commit
89f817859e

+ 9 - 0
src/main/java/com/goafanti/techproject/bo/TaskDetailsBo.java

@@ -1,6 +1,7 @@
 package com.goafanti.techproject.bo;
 
 import com.goafanti.common.model.TaskDetails;
+import com.goafanti.common.model.TaskFeature;
 
 import java.util.List;
 import java.util.Map;
@@ -22,8 +23,16 @@ public class TaskDetailsBo extends TaskDetails {
 
 
     List<Map<String,Object >> taskList;
+    List<TaskFeature> featureList;
 
 
+    public List<TaskFeature> getFeatureList() {
+        return featureList;
+    }
+
+    public void setFeatureList(List<TaskFeature> featureList) {
+        this.featureList = featureList;
+    }
 
     public String getUserName() {
         return userName;

+ 6 - 1
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -113,6 +113,11 @@ public class TaskDetailsController extends BaseController {
         return this.taskDetailsService.export(id);
     }
 
+    /**
+     * 新增特色工作
+     * @param in
+     * @return
+     */
     @PostMapping("/addTaskFeature")
     public Result<TaskFeature> addTaskFeature(TaskFeature in) {
         Result<TaskFeature> res = new Result<>();
@@ -120,7 +125,7 @@ public class TaskDetailsController extends BaseController {
     }
 
     /**
-     * 编辑项目进度数据
+     * 编辑项目特色工作
      *
      * @param in 实体
      * @return 编辑结果

+ 9 - 8
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -62,16 +62,16 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
     @Override
     public TaskDetailsBo getByTid(Integer id) {
         TaskDetailsBo res = new TaskDetailsBo();
+
         TaskDetails taskDetails=taskDetailsMapper.selectByTid(id);
+        //首先直接查找,找不到的情况下找订单
+        TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
+        TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
+        List<Map<String,Object >> list=new ArrayList<>();
         if (taskDetails==null){
-            return res;
-        }
 
-
-            TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
-            TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
             List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
-            List<Map<String,Object >> list=new ArrayList<>();
+
             //如果是会员
             TOrderTaskBo thisTask = null;
             for (TOrderTaskBo e : tOrderTaskBos) {
@@ -97,6 +97,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                     list.add(map);
                 }
             }
+            return res;
+        }
             BeanUtils.copyProperties(taskDetails, res);
             BigDecimal totalAmount = tOrderNew.getTotalAmount();
             String lvl=null;
@@ -113,8 +115,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             res.setMemberStatus(mid.getProjectType());
             res.setMemberLvl(lvl);
             res.setTaskList(list);
-
-
+            res.setFeatureList(taskFeatureMapper.selectByTdId(id));
         return res;
     }