add [@CompanyNameTranslate]注解,解决查询单位名称判断是否已审核
This commit is contained in:
@@ -63,20 +63,20 @@ public class CompanyNameAspect {
|
||||
Object result1 = ((Result<Object>) result).getResult();
|
||||
String jsonStr = JSONUtil.toJsonStr(result1);
|
||||
if (((Result) result).getResult() instanceof IPage) {
|
||||
List<PayCompanyManagement> items = new ArrayList<>();
|
||||
List<Object> items = new ArrayList<>();
|
||||
for (Object record : ((IPage) ((Result) result).getResult()).getRecords()) {
|
||||
|
||||
PayCompanyManagement translate = translate(record, companyNameTranslate);
|
||||
Object translate = translate(record, companyNameTranslate);
|
||||
items.add(translate);
|
||||
}
|
||||
((IPage) ((Result) result).getResult()).setRecords(items);
|
||||
} else if (JSONUtil.isJsonObj(jsonStr)) {
|
||||
PayCompanyManagement translate = translate(result1, companyNameTranslate);
|
||||
Object translate = translate(result1, companyNameTranslate);
|
||||
((Result<Object>) result).setResult(translate);
|
||||
} else {
|
||||
List<PayCompanyManagement> items = new ArrayList<>();
|
||||
List<Object> items = new ArrayList<>();
|
||||
for (Object o : (List<Object>) result1) {
|
||||
PayCompanyManagement translate = translate(o, companyNameTranslate);
|
||||
Object translate = translate(o, companyNameTranslate);
|
||||
items.add(translate);
|
||||
}
|
||||
((Result<Object>) result).setResult(items);
|
||||
@@ -84,7 +84,8 @@ public class CompanyNameAspect {
|
||||
}
|
||||
}
|
||||
|
||||
private PayCompanyManagement translate(Object record, CompanyNameTranslate companyNameTranslate) {
|
||||
private Object translate(Object record, CompanyNameTranslate companyNameTranslate) {
|
||||
Class<?> recordClass = record.getClass();
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
String json = "{}";
|
||||
try {
|
||||
@@ -96,7 +97,7 @@ public class CompanyNameAspect {
|
||||
JSONObject item = JSONObject.parseObject(json);
|
||||
String fieldId = companyNameTranslate.fieldId();
|
||||
String fieldName = companyNameTranslate.fieldName();
|
||||
String splicing = companyNameTranslate.Splicing();
|
||||
String splicing = companyNameTranslate.splicing();
|
||||
|
||||
for (Field field : oConvertUtils.getAllFields(record)) {
|
||||
|
||||
@@ -109,6 +110,6 @@ public class CompanyNameAspect {
|
||||
}
|
||||
}
|
||||
}
|
||||
return JSONObject.parseObject(String.valueOf(item),PayCompanyManagement.class);
|
||||
return JSONObject.parseObject(String.valueOf(item),recordClass);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -23,5 +23,5 @@ public @interface CompanyNameTranslate {
|
||||
/**
|
||||
* 拼接内容
|
||||
*/
|
||||
String Splicing() default " (待审核)";
|
||||
String splicing() default " (待审核)";
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ObjRecordUtil {
|
||||
field2.setAccessible(true); // 设置属性是可以访问的(私有的也可以)
|
||||
if (field1.equals(field2)) { // 比较属性名是否一样
|
||||
if (field2.get(newObj) == null || StringUtils.isEmpty(field2.get(newObj) + "")) {
|
||||
break; // 属性名称一样就退出二级循环
|
||||
break; // 属性名称为空
|
||||
}
|
||||
if (!Objects.equals(field1.get(oldObj), field2.get(newObj))) { // 比较属性值是否一样
|
||||
// 得到注解
|
||||
|
||||
Reference in New Issue
Block a user