FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 78302内外部会议，政策法规资料修改记录处理null值

Browse Source
This commit is contained in:
wxyclub
2023-11-30 14:28:31 +08:00
parent f080e0c2c3
commit 6344177929
2 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java
+13 -3
View File
@@ -561,7 +561,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
Method method = InsideOutsideMeeting.class.getMethod("get" + fieldName + "Name"); Method method = InsideOutsideMeeting.class.getMethod("get" + fieldName + "Name");
Object oldTypeName = method.invoke(oldMeeting); Object oldTypeName = method.invoke(oldMeeting);
CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
changes.add(annotationsByType.fieldName() + "由\"" + oldTypeName + "\"改为\"" + typeName + "\""); changes.add(annotationsByType.fieldName() + "由\"" + Optional.ofNullable(oldTypeName).orElse("空") + "\"改为\"" + Optional.ofNullable(typeName).orElse("空") + "\"");
} else if ("meetingMinutes".equals(field.getName())) { } else if ("meetingMinutes".equals(field.getName())) {
String oldValueStr = String.valueOf(oldValue); String oldValueStr = String.valueOf(oldValue);
String newValueStr = String.valueOf(newValue); String newValueStr = String.valueOf(newValue);
@@ -584,9 +584,19 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
oldFileNameList.add(oldFile1.getOldFileName()); oldFileNameList.add(oldFile1.getOldFileName());
} }
} }
if (StringUtils.isBlank(String.join(",",oldFileNameList))) {
oldValue = "空";
}else {
oldValue = String.join(",",oldFileNameList);
}
if (StringUtils.isBlank(String.join(",",fileNameList))) {
newValue = "空";
}else {
newValue = String.join(",",fileNameList);
}
// 获取字段名称 // 获取字段名称
CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
changes.add(annotationsByType.fieldName() + "由\"" + String.join(",",oldFileNameList) + "\"改为\"" + String.join(",",fileNameList) + "\""); changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
} else if ("meetingTopicList".equals(field.getName())) { } else if ("meetingTopicList".equals(field.getName())) {
String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
Method method = InsideOutsideMeeting.class.getMethod("get" + fieldName); Method method = InsideOutsideMeeting.class.getMethod("get" + fieldName);
@@ -600,7 +610,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
} }
} else { } else {
CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); changes.add(annotationsByType.fieldName() + "由\"" + Optional.ofNullable(oldValue).orElse("空") + "\"改为\"" + Optional.ofNullable(newValue).orElse("空") + "\"");
} }
} }
} catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
+26 -26
View File
@@ -631,34 +631,24 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
if (annotationPresent) { if (annotationPresent) {
try { try {
field.setAccessible(true); field.setAccessible(true);
String oldValue = String.valueOf(field.get(oldInfo)); // String oldValue = String.valueOf(field.get(oldInfo));
String newValue = String.valueOf(field.get(newInfo)); // String newValue = String.valueOf(field.get(newInfo));
Object oldValue = field.get(oldInfo);
Object newValue = field.get(newInfo);
if (oldValue instanceof Date){
oldValue = sdf.format((Date)oldValue);
}
if( newValue instanceof Date) {
newValue = sdf.format((Date)newValue);
}
if (!Objects.equals(oldValue, newValue)) { if (!Objects.equals(oldValue, newValue)) {
switch (field.getName()) { switch (field.getName()) {
// case "firstType":
// case "secondType":
// case "thirdType":
// case "fourthType": {
// List<String> typeNameList = new ArrayList<>();
// if (StringUtils.isNotBlank(newValue)) {
// for (String type : newValue.split(",")) {
// if (StringUtils.isNotBlank(type)) {
// typeNameList.add(dicTypeService.getDicTypeNameByDicCode(type));
// }
// }
// }
// // 获取资料类型名称
// String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
// Method method = SarLawsInformation.class.getMethod("get" + fieldName + "Name");
// Object oldTypeName = method.invoke(oldInfo);
// ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0];
// changes.add(annotationsByType.value() + "由\"" + oldTypeName + "\"改为\"" + String.join(",", typeNameList) + "\"");
// break;
// }
case "informationFile": { case "informationFile": {
List<String> fileNameList = new ArrayList<>(); List<String> fileNameList = new ArrayList<>();
if (StringUtils.isNotBlank(newValue)) { String oldValueStr = String.valueOf(field.get(oldInfo));
String[] split = newValue.split(","); String newValueStr = String.valueOf(field.get(newInfo));
if (StringUtils.isNotBlank(newValueStr)) {
String[] split = newValueStr.split(",");
for (String attId : split) { for (String attId : split) {
AttFileEO fileInfo = attFileEOService.getFileInfo(attId); AttFileEO fileInfo = attFileEOService.getFileInfo(attId);
fileNameList.add(fileInfo.getOldFileName()); fileNameList.add(fileInfo.getOldFileName());
@@ -675,14 +665,24 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
oldFileNameList.add(oldFile1.getOldFileName()); oldFileNameList.add(oldFile1.getOldFileName());
} }
} }
if (StringUtils.isBlank(String.join(",",oldFileNameList))) {
oldValue = "空";
}else {
oldValue = String.join(",",oldFileNameList);
}
if (StringUtils.isBlank(String.join(",",fileNameList))) {
newValue = "空";
}else {
newValue = String.join(",",fileNameList);
}
// 获取字段名称 // 获取字段名称
CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
changes.add(annotationsByType.fieldName() + "由\"" + String.join(",", oldFileNameList) + "\"改为\"" + String.join(",", fileNameList) + "\""); changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\"");
break; break;
} }
default: { default: {
CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0];
changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); changes.add(annotationsByType.fieldName() + "由\"" + Optional.ofNullable(oldValue).orElse("空") + "\"改为\"" + Optional.ofNullable(newValue).orElse("空") + "\"");
break; break;
} }
} }