Просмотр исходного кода

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

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

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

@@ -62,16 +62,13 @@ 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){
-
             List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
-
             //如果是会员
             TOrderTaskBo thisTask = null;
             for (TOrderTaskBo e : tOrderTaskBos) {
@@ -97,9 +94,10 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                     list.add(map);
                 }
             }
-            return res;
         }
+        if (taskDetails!=null){
             BeanUtils.copyProperties(taskDetails, res);
+        }
             BigDecimal totalAmount = tOrderNew.getTotalAmount();
             String lvl=null;
             if (totalAmount.compareTo(new BigDecimal("3"))<0){