|
|
@@ -98,11 +98,13 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
Integer tid=null;
|
|
|
for (TOrderTaskBo e : collect2) {
|
|
|
//添加判定去掉赠字比对
|
|
|
- String serviceYear2;
|
|
|
+ String serviceYear2 = null;
|
|
|
if (StringUtils.isEmpty(e.getServiceYear())){
|
|
|
serviceYear2 = "";
|
|
|
}else{
|
|
|
- serviceYear2 = e.getServiceYear();
|
|
|
+ if (e.getServiceYear().contains("(赠)")){
|
|
|
+ serviceYear2=e.getServiceYear().replace("(赠)", "");
|
|
|
+ }
|
|
|
}
|
|
|
if (serviceYear2.contains("(赠)")){
|
|
|
serviceYear2=serviceYear2.replace("(赠)", "");
|
|
|
@@ -168,9 +170,13 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
Integer tid=null;
|
|
|
for (TOrderTaskBo e : collect2) {
|
|
|
//添加判定去掉赠字比对
|
|
|
- String serviceYear2 = e.getServiceYear();
|
|
|
- if (serviceYear2.contains("(赠)")){
|
|
|
- serviceYear2=serviceYear2.replace("(赠)", "");
|
|
|
+ String serviceYear2 = null;
|
|
|
+ if (StringUtils.isEmpty(e.getServiceYear())){
|
|
|
+ serviceYear2 = "";
|
|
|
+ }else{
|
|
|
+ if (e.getServiceYear().contains("(赠)")){
|
|
|
+ serviceYear2=e.getServiceYear().replace("(赠)", "");
|
|
|
+ }
|
|
|
}
|
|
|
if (serviceYear2.equals(serviceYear)){
|
|
|
Map<String,Object> map=new HashMap<>();
|