From 0b9afb807d842a502bc51e8269efac597bdeeab4 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 18 Apr 2022 16:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86-=E6=97=A5=E6=9C=9F=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/util/DateUtils.java | 57 ++++++++++++++----- .../impl/FileSplitItemsEOServiceImpl.java | 34 +++++++++-- 2 files changed, 74 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java index 3b645a7d3..bb6364cc7 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java @@ -1,15 +1,13 @@ package com.jero.common.util; +import org.springframework.util.StringUtils; + import java.beans.PropertyEditorSupport; import java.sql.Timestamp; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; - -import org.springframework.util.StringUtils; +import java.util.*; /** * 类描述：时间操作定义类 @@ -647,7 +645,7 @@ public class DateUtils extends PropertyEditorSupport { return calendar.get(Calendar.YEAR); } /*** - * @Description: 判断多个日期是否都符合日期格式 + * @Description: 判断多个日期是否都符合日期格式 yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日 * @Author: yangxuenan * @Date: 2020/12/31 11:31 * @Param: [str] @@ -655,19 +653,52 @@ public class DateUtils extends PropertyEditorSupport { */ public static boolean isValidDate(String str){ if(org.apache.commons.lang3.StringUtils.isNotBlank(str)){ - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String dateRegex = "^\\d{4}年\\d{1,2}月\\d{1,2}日"; + str = str.replace("，",","); String[] strArr = str.split(","); for (String dateStr : strArr) { - String replace = dateStr.replace("/", "-"); - try { - simpleDateFormat.setLenient(false); - simpleDateFormat.parse(replace); - } catch (Exception e){ - return false; + if(dateStr.matches(dateRegex)){ + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日"); + try { + simpleDateFormat.setLenient(false); + simpleDateFormat.parse(dateStr); + } catch (Exception e){ + return false; + } + } else { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String replace = dateStr.replace("/", "-"); + try { + simpleDateFormat.setLenient(false); + simpleDateFormat.parse(replace); + } catch (Exception e){ + return false; + } } } } return true; } + //yyyy年MM月dd日，yyyy/MM/dd 转 yyyy-MM-dd + public static String coverDate(String str) throws ParseException { + List newStrList = new ArrayList<>(); + String dateRegex = "^\\d{4}年\\d{1,2}月\\d{1,2}日"; + str = str.replace("，",","); + String[] strArr = str.split(","); + for (String dateStr : strArr) { + String newStr = null; + if (dateStr.matches(dateRegex)) { + Date date = new SimpleDateFormat("yyyy年MM月dd日").parse(dateStr); + newStr = new SimpleDateFormat("yyyy-MM-dd").format(date); + } else if (dateStr.contains("/")) { + Date date = new SimpleDateFormat("yyyy/MM/dd").parse(dateStr); + newStr = new SimpleDateFormat("yyyy-MM-dd").format(date); + } else if (dateStr.contains("-")){ + newStr = dateStr; + } + newStrList.add(newStr); + } + return org.apache.commons.lang3.StringUtils.join(newStrList, ","); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index f57c51cf2..b1fefd12b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -539,11 +539,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysUserList = sysUserService.listByIds(Arrays.asList(entry.getValue().toString().split(","))); StringBuilder stringBuilder = new StringBuilder(); - for(SysUser user : sysUserList){ - stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),"); + if (CollectionUtil.isNotEmpty(sysUserList)) { + for (SysUser user : sysUserList) { + stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),"); + } + String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(",")); + entry.setValue(value); } - String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(",")); - entry.setValue(value); } // 标准选择 if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) { @@ -797,6 +799,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl getInfoById(String id) { + if (StringUtils.isBlank(id)) { + return null; + } Map itemsMap = dao.selectByPrimaryKey(id); // 查询条款表单字段 List formFieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); @@ -2035,6 +2040,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl