fix(企标稽查计划): 79646
This commit is contained in:
+7
-1
@@ -238,7 +238,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
|
|||||||
firstVerify.addAll(sixthVerify);
|
firstVerify.addAll(sixthVerify);
|
||||||
|
|
||||||
if (!firstVerify.isEmpty()){
|
if (!firstVerify.isEmpty()){
|
||||||
errorMSG.append(head).append(String.join(",", firstVerify));
|
errorMSG.append(head).append(String.join("", firstVerify));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//update-begin-author:taoyan date:20190528 for:批量插入数据
|
//update-begin-author:taoyan date:20190528 for:批量插入数据
|
||||||
@@ -302,6 +302,12 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
|
|||||||
if (StringUtils.isNotBlank(processEsInspectPlan.getPlanInspectDates())){
|
if (StringUtils.isNotBlank(processEsInspectPlan.getPlanInspectDates())){
|
||||||
try{
|
try{
|
||||||
Date parse = dateFormat.parse(processEsInspectPlan.getPlanInspectDates());
|
Date parse = dateFormat.parse(processEsInspectPlan.getPlanInspectDates());
|
||||||
|
Calendar instance = Calendar.getInstance();
|
||||||
|
instance.setTime(parse);
|
||||||
|
int weekYear = instance.getWeekYear();
|
||||||
|
if (String.valueOf(weekYear).length() > 4){
|
||||||
|
throw new JeroBootException("");
|
||||||
|
}
|
||||||
processEsInspectPlan.setPlanInspectDate(parse);
|
processEsInspectPlan.setPlanInspectDate(parse);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
errorList.add("计划稽查日期格式不正确!(正确格式:yyyy-MM-dd)");
|
errorList.add("计划稽查日期格式不正确!(正确格式:yyyy-MM-dd)");
|
||||||
|
|||||||
Reference in New Issue
Block a user