|
|
@@ -54,19 +54,35 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
|
|
|
TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
- TaskDetails taskDetails=new TaskDetails();
|
|
|
+ List<Map<String,Object >> list=new ArrayList<>();
|
|
|
+ TaskDetails taskDetails=taskDetailsMapper.selectByTid(id);
|
|
|
//如果是会员
|
|
|
- if (mid.getProjectType()==1){
|
|
|
- List<TOrderTaskBo> list =new ArrayList<>();
|
|
|
- for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
- //
|
|
|
- if (e.getcSort()==6){
|
|
|
- taskDetails = queryByTid(id);
|
|
|
- if (taskDetails!=null) break;
|
|
|
+ TOrderTaskBo thisTask = null;
|
|
|
+ for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ if (e.getId().equals(id)){
|
|
|
+ thisTask=e;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String serviceYear = thisTask.getServiceYear();
|
|
|
+ if (serviceYear.contains("(赠)")){
|
|
|
+ serviceYear=serviceYear.replace("(赠)", "");
|
|
|
+ }
|
|
|
+ for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
+ if (e.getServiceYear().equals(serviceYear)){
|
|
|
+ Map<String,Object> map=new HashMap<>();
|
|
|
+ map.put("serviceYear", e.getServiceYear());
|
|
|
+ map.put("taskName", e.getCommodityName());
|
|
|
+ map.put("id",e.getId());
|
|
|
+ //如果没有项目进度,查询同年份的项目进度
|
|
|
+ if (taskDetails==null&&!e.getId().equals(id)&&e.getcSort()==6){
|
|
|
+ taskDetails=taskDetailsMapper.selectByTid(e.getId());
|
|
|
}
|
|
|
+ list.add(map);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
TaskDetailsBo res = new TaskDetailsBo();
|
|
|
BeanUtils.copyProperties(taskDetails, res);
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount();
|
|
|
@@ -82,13 +98,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
res.setContractNo(tOrderNew.getContractNo());
|
|
|
res.setMemberStatus(mid.getProjectType());
|
|
|
res.setMemberLvl(lvl);
|
|
|
-
|
|
|
- res.setTaskList(tOrderTaskBos);
|
|
|
+ res.setTaskList(list);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
private TaskDetails queryByTid(Integer id) {
|
|
|
- return taskDetailsMapper.queryByTid(id);
|
|
|
+ return taskDetailsMapper.selectByTid(id);
|
|
|
}
|
|
|
|
|
|
/**
|