修改法规预警搜索时间问题

This commit is contained in:
高嵩
2023-06-15 18:12:30 +08:00
parent eaab063e5d
commit bfc843c802
@@ -98,9 +98,13 @@ public class LawsWarnService {
//处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
String flag = String.valueOf(parameter.get("flag"));
if(StringUtils.equals(flag,"0")){
parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
if(ObjectUtils.isEmpty(parameter.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
}
} else if(StringUtils.equals(flag,"1")){
parameter.put("implement_time",parameter.get("WarnTime"));
if(ObjectUtils.isEmpty(parameter.get("implement_time"))){
parameter.put("implement_time",parameter.get("WarnTime"));
}
}
// parameter.remove("WarnTime");
@@ -249,7 +253,9 @@ public class LawsWarnService {
Date newCarModelDate = null;
try {
newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd");
if(ObjectUtils.isNotEmpty(data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd");
}
} catch (ParseException e) {
e.printStackTrace();
}
@@ -269,7 +275,9 @@ public class LawsWarnService {
}).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList());
Date implementTime = null;
try {
implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd");
if(ObjectUtils.isNotEmpty(data.get("implement_time"))){
implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd");
}
} catch (ParseException e) {
e.printStackTrace();
}