WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

拆分-多日期回显bug修改

Browse Source
This commit is contained in:
liyawei
2022-04-20 16:53:02 +08:00
parent 7df22a72a9
commit bd36d25b0c
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java
+1
View File
@@ -699,6 +699,7 @@ public class DateUtils extends PropertyEditorSupport {
} }
newStrList.add(newStr); newStrList.add(newStr);
} }
newStrList.sort((t1, t2) -> t1.compareTo(t2)); // 日期增序
return org.apache.commons.lang3.StringUtils.join(newStrList, ","); return org.apache.commons.lang3.StringUtils.join(newStrList, ",");
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+26 -9
View File
@@ -542,6 +542,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if (CollectionUtil.isNotEmpty(sysUserList)) { if (CollectionUtil.isNotEmpty(sysUserList)) {
for (SysUser user : sysUserList) { for (SysUser user : sysUserList) {
stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),"); stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),");
// stringBuilder.append(user.getUsername()).append(",");
} }
String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(",")); String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(","));
entry.setValue(value); entry.setValue(value);
@@ -814,12 +815,22 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
for (OnlCgformField onlCgformField : formFieldList){ for (OnlCgformField onlCgformField : formFieldList){
String fieldType = onlCgformField.getFieldShowType(); String fieldType = onlCgformField.getFieldShowType();
String dbFieldName = onlCgformField.getDbFieldName(); String dbFieldName = onlCgformField.getDbFieldName();
// 树形结构
if (FieldTypeEnum.TREE.getValue().equals(fieldType)) { if (FieldTypeEnum.TREE.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) { if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
String[] values = itemsMap.get(dbFieldName).toString().split(","); String[] values = itemsMap.get(dbFieldName).toString().split(",");
itemsMap.put(dbFieldName, values); itemsMap.put(dbFieldName, values);
} }
} }
// 多日期选择
if (FieldTypeEnum.DATE_MORE.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
List<String> valuesList = Arrays.asList(itemsMap.get(dbFieldName).toString().split(","));
valuesList.sort((t1, t2) -> t1.compareTo(t2)); // 日期增序
itemsMap.put(dbFieldName, valuesList);
}
}
// 人员选择
if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) { if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) { if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(","))); List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")));
@@ -829,6 +840,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
List<String> names = new ArrayList<>(); List<String> names = new ArrayList<>();
for(int i=0; i<realNames.size(); i++){ for(int i=0; i<realNames.size(); i++){
String name = realNames.get(i) + "(" + userNames.get(i) + ")"; String name = realNames.get(i) + "(" + userNames.get(i) + ")";
// String name = userNames.get(i);
names.add(name); names.add(name);
} }
itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString()); itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
@@ -837,6 +849,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} }
} }
} }
// 标准选择
if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) { if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) { if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString()); List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString());
@@ -2066,16 +2079,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
value = DateUtils.coverDate((String) value); value = DateUtils.coverDate((String) value);
} }
//判断是否是两个日期点 if (StringUtils.isNotBlank(value)) {
String str = value.replace("，",","); //判断是否是两个日期点
String[] strArr = str.split(","); String str = value.replace("，", ",");
if (strArr.length != 2) { String[] strArr = str.split(",");
if(CutEnum.CN.getValue().equals(cut)){ if (strArr.length != 2) {
errorMsg += fieldName + "必须填写两个日期；"; if (CutEnum.CN.getValue().equals(cut)) {
}else{ errorMsg += fieldName + "必须填写两个日期；";
errorMsg += fieldName + " must fill in the two dates;"; } else {
errorMsg += fieldName + " must fill in the two dates;";
}
countError++;
} }
countError++;
} }
} else if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) { } else if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) {
@@ -2201,6 +2216,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
countError++; countError++;
}else { }else {
String uName = userNames[u].substring(userNames[u].indexOf("(") + 1, userNames[u].indexOf(")")); String uName = userNames[u].substring(userNames[u].indexOf("(") + 1, userNames[u].indexOf(")"));
// String uName = userNames[u];
SysUser user = sysUserService.getUserByName(uName); SysUser user = sysUserService.getUserByName(uName);
if (ObjectUtils.isNotEmpty(user)) { if (ObjectUtils.isNotEmpty(user)) {
userIdList.add(user.getId()); userIdList.add(user.getId());
@@ -2210,6 +2226,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
errorMsg += fieldName + " " + userNames[u] + "Not exist;"; errorMsg += fieldName + " " + userNames[u] + "Not exist;";
} }
countError++;
} }
} }
} }