From aac903e7664d8520719f029e9168dc553a53dd38 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 28 Dec 2023 16:03:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92):=2079646?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInspectPlanServiceImpl.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
index e641ae7e..a8c08cfa 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
@@ -238,7 +238,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 				firstVerify.addAll(sixthVerify);
 
 				if (!firstVerify.isEmpty()){
-					errorMSG.append(head).append(String.join(",", firstVerify));
+					errorMSG.append(head).append(String.join("", firstVerify));
 				}
 			}
 			//update-begin-author:taoyan date:20190528 for:批量插入数据
@@ -302,6 +302,12 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 		if (StringUtils.isNotBlank(processEsInspectPlan.getPlanInspectDates())){
 			try{
 				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);
 			}catch (Exception e){
 				errorList.add("计划稽查日期格式不正确!（正确格式：yyyy-MM-dd）");