|
|
@@ -96,9 +96,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
for (TOrderTaskBo e : collect2) {
|
|
|
//添加判定去掉赠字比对
|
|
|
String serviceYear2 =getServiceYer(e.getServiceYear());
|
|
|
- if (serviceYear2.contains("(赠)")){
|
|
|
- serviceYear2=serviceYear2.replace("(赠)", "");
|
|
|
- }
|
|
|
if (serviceYear2.equals(serviceYear)){
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
map.put("serviceYear", e.getServiceYear());
|
|
|
@@ -173,6 +170,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}else{
|
|
|
if (serviceYear.contains("(赠)")){
|
|
|
serviceYear2 = serviceYear.replace("(赠)", "");
|
|
|
+ }else {
|
|
|
+ serviceYear2 = serviceYear;
|
|
|
}
|
|
|
}
|
|
|
return serviceYear2;
|
|
|
@@ -421,10 +420,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- String serviceYear = thisTask.getServiceYear();
|
|
|
- if (serviceYear.contains("(赠)")){
|
|
|
- serviceYear=serviceYear.replace("(赠)", "");
|
|
|
- }
|
|
|
+ String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
list=addOrderList(tOrderTaskBos, serviceYear);
|
|
|
if (taskDetails !=null){
|
|
|
BeanUtils.copyProperties(log, res);
|
|
|
@@ -445,7 +441,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
private List<Map<String, Object>> addOrderList(List<TOrderTaskBo> tOrderTaskBos, String serviceYear) {
|
|
|
List<Map<String, Object>> list =new ArrayList<>();
|
|
|
for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
- if (e.getServiceYear().equals(serviceYear)){
|
|
|
+ String serviceYear1 = getServiceYer(e.getServiceYear());
|
|
|
+ if (serviceYear1.equals(serviceYear)){
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
map.put("serviceYear", e.getServiceYear());
|
|
|
map.put("taskName", e.getCommodityName());
|