|
|
@@ -4,6 +4,7 @@ import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
+import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
@@ -97,7 +98,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
Integer tid=null;
|
|
|
for (TOrderTaskBo e : collect2) {
|
|
|
//添加判定去掉赠字比对
|
|
|
- String serviceYear2 = e.getServiceYear();
|
|
|
+ String serviceYear2;
|
|
|
+ if (StringUtils.isEmpty(e.getServiceYear())){
|
|
|
+ serviceYear2 = "";
|
|
|
+ }else{
|
|
|
+ serviceYear2 = e.getServiceYear();
|
|
|
+ }
|
|
|
if (serviceYear2.contains("(赠)")){
|
|
|
serviceYear2=serviceYear2.replace("(赠)", "");
|
|
|
}
|