|
|
@@ -73,6 +73,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
TaskDetails taskDetails=taskDetailsMapper.selectById(tOrderTask.getProgressTid());
|
|
|
if (taskDetails !=null){
|
|
|
BeanUtils.copyProperties( taskDetails,res);
|
|
|
+ }else {
|
|
|
+ res.setTid(id);
|
|
|
}
|
|
|
addOrderInformation(res);
|
|
|
return res;
|
|
|
@@ -122,6 +124,9 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
TTaskMember tTaskMember = ttaskMemberMapper.selectByTid(tOrderTask.getId());
|
|
|
String serviceYear = getServiceYer(tTaskMember.getServiceYear());
|
|
|
+ if (StringUtils.isEmpty(bo.getTaskName())){
|
|
|
+ bo.setTaskName(mid.getSalesmanName());
|
|
|
+ }
|
|
|
addOrderList(collect2,serviceYear,bo);
|
|
|
bo.setUserName(mid.getBuyerName());
|
|
|
bo.setOrderNo(tOrderNew.getOrderNo());
|
|
|
@@ -496,6 +501,10 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
if (bo.getId()!=null) flag=true;
|
|
|
}
|
|
|
}
|
|
|
+ if (e.getId().equals(bo.getTid())
|
|
|
+ &&StringUtils.isEmpty(bo.getProjectName())){
|
|
|
+ bo.setProjectName(e.getReceiverName());
|
|
|
+ }
|
|
|
}
|
|
|
if (flag){
|
|
|
TaskDetails update = new TaskDetails();
|