|
|
@@ -1984,6 +1984,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public List<TaskStopLogBo> projectStopList(Integer taskStopId) {
|
|
|
List<TaskStopLogBo> list =taskStopLogMapper.selectListBySoptId(taskStopId);
|
|
|
+ TaskStopLogBo taskStopLogBo = list.get(list.size() - 1);
|
|
|
+ if (taskStopLogBo.getStatus()==0){
|
|
|
+ TaskStopLogBo newBo=new TaskStopLogBo();
|
|
|
+ TaskStop taskStop = taskStopMapper.selectByPrimaryKey(Long.valueOf(taskStopId));
|
|
|
+ TOrderTask tOrderTask = tOrderTaskMapper.queryById(taskStop.getTid());
|
|
|
+ TOrderNewBo tOrderNew = tOrderNewMapper.getOrderNewDetail(tOrderTask.getOrderNo());
|
|
|
+ List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(),AFTConstants.SALESMAN_ADMIN);
|
|
|
+ StringBuilder str=new StringBuilder();
|
|
|
+ for (Admin admin : admins) {
|
|
|
+ if (!str.toString().contains(admin.getName()))str.append(admin.getName()).append(",");
|
|
|
+ }
|
|
|
+ newBo.setCreateName(str.substring(0,str.length()-1));
|
|
|
+ list.add(newBo);
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|