|
|
@@ -109,7 +109,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByTid(bo.getTid());
|
|
|
TOrderTask tOrderTask = tOrderTaskMapper.queryById(bo.getTid());
|
|
|
TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
- List<Map<String,Object >> list=new ArrayList<>();
|
|
|
+ List<Map<String,Object >> list;
|
|
|
//获取项目服务年份算出平均值
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), null);
|
|
|
List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 1).collect(Collectors.toList());
|
|
|
@@ -138,7 +138,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
|
|
|
private String getServiceYer(String serviceYear) {
|
|
|
- String serviceYear2=null;
|
|
|
+ String serviceYear2;
|
|
|
if (StringUtils.isEmpty(serviceYear)){
|
|
|
serviceYear2 = "";
|
|
|
}else{
|
|
|
@@ -210,7 +210,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(orderNo, null);
|
|
|
List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
//如果是会员
|
|
|
- TOrderTaskBo thisTask = null;
|
|
|
+ TOrderTaskBo thisTask = new TOrderTaskBo();
|
|
|
for (TOrderTaskBo e : collect) {
|
|
|
if (e.getId().equals(taskDetails.getTid())){
|
|
|
thisTask=e;
|
|
|
@@ -219,7 +219,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
for (TOrderTaskBo tOrderTaskBo : collect) {
|
|
|
- if (serviceYear != null ){
|
|
|
+ if (StringUtils.isNotEmpty(serviceYear)){
|
|
|
String serviceYer2 = getServiceYer(tOrderTaskBo.getServiceYear());
|
|
|
if (serviceYear.equals(serviceYer2)){
|
|
|
TOrderTask updatedTask = new TOrderTask();
|
|
|
@@ -245,6 +245,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
BeanUtils.copyProperties( taskDetails,log);
|
|
|
log.setTdid(taskDetails.getId());
|
|
|
log.setId(null);
|
|
|
+ assert adminToken != null;
|
|
|
log.setAid(adminToken.getId());
|
|
|
log.setAname(adminToken.getName());
|
|
|
log.setCreateTime(new Date());
|
|
|
@@ -359,8 +360,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
@Override
|
|
|
public Object updateDownload(TaskDetails newTd) {
|
|
|
this.taskDetailsMapper.update(newTd);
|
|
|
- TaskDetails res = this.queryById(newTd.getId());
|
|
|
- return res;
|
|
|
+ return this.queryById(newTd.getId());
|
|
|
}
|
|
|
|
|
|
|