Browse Source

会员进度详情修改

anderx 1 year ago
parent
commit
cbf3986a8e

+ 3 - 38
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -69,47 +69,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
     @Override
     public TaskDetailsBo pushByTid(Integer id) {
         TaskDetailsBo res = new TaskDetailsBo();
-        TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
         TOrderTask tOrderTask = tOrderTaskMapper.queryById(id);
-        TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
-        List<Map<String,Object >> list=new ArrayList<>();
-        TaskDetails taskDetails=null;
-        //获取项目服务年份算出平均值
-        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), null);
-        List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 1).collect(Collectors.toList());
-        List<TOrderTaskBo> collect2 = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
-        int yearSum=1;
-        for (TOrderTaskBo e : collect) {
-            if (e.getYearSum()>yearSum){
-                yearSum=e.getYearSum();
-            }
-        }
-        taskDetails=taskDetailsMapper.selectById(tOrderTask.getProgressTid());
-        //如果是会员
-        TOrderTaskBo thisTask = null;
-        for (TOrderTaskBo e : collect2) {
-            if (e.getId().equals(id)){
-                thisTask=e;
-                break;
-            }
-        }
-        String serviceYear = getServiceYer(thisTask.getServiceYear());
-        list=addOrderList(collect2,serviceYear);
+        TaskDetails taskDetails=taskDetailsMapper.selectById(tOrderTask.getProgressTid());
         if (taskDetails !=null){
-                BeanUtils.copyProperties( taskDetails,res);
-        }
-        res.setUserName(mid.getBuyerName());
-        res.setOrderNo(tOrderNew.getOrderNo());
-        res.setContractNo(tOrderNew.getContractNo());
-        res.setServiceYear(serviceYear);
-        res.setMemberStatus(mid.getProjectType());
-        res.setTaskList(list);
-        BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
-        String lvl=getOrderLvl(totalAmount);
-        res.setMemberLvl(lvl);
-        if (taskDetails!=null&&taskDetails.getTid()!=null){
-            res.setFeatureList(taskFeatureMapper.selectByTdId(taskDetails.getId()));
+            BeanUtils.copyProperties( taskDetails,res);
         }
+        addOrderInformation(res);
         return res;
     }