|
@@ -111,7 +111,7 @@ public class HandlerFormDataUtils {
|
|
|
for (GenTableColumn column : fkColumns) {
|
|
|
String selfColumnName = column.getColumnName();
|
|
|
if (containsKeyIgnoreCase(jsonObject, selfColumnName)) {
|
|
|
- JSONObject fkMap = getFkMap(column.getFkInfo(), jsonObject.get(selfColumnName));
|
|
|
+ JSONObject fkMap = getFkInfoForQueryList(column.getFkInfo(), jsonObject.get(selfColumnName));
|
|
|
jsonObject.put(selfColumnName.toLowerCase(), fkMap);
|
|
|
}
|
|
|
}
|
|
@@ -166,7 +166,7 @@ public class HandlerFormDataUtils {
|
|
|
return DateUtils.dateTime(date);
|
|
|
}
|
|
|
|
|
|
- public static JSONObject getFkMap(Map<String, Object> fkInfoMap, Object value) {
|
|
|
+ public static JSONObject getFkInfoForQueryList(Map<String, Object> fkInfoMap, Object value) {
|
|
|
Object fkTableName = fkInfoMap.get(FK_TABLE_NAME);
|
|
|
Object fkColumnName = fkInfoMap.get(FK_COLUMN_NAME);
|
|
|
Object dkColumnName = fkInfoMap.get(DK_COLUMN_NAME);
|
|
@@ -187,6 +187,31 @@ public class HandlerFormDataUtils {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ public static JSONObject getFkInfoForGetObject(Map<String, Object> fkInfoMap, Object value) {
|
|
|
+ Object fkTableName = fkInfoMap.get(FK_TABLE_NAME);
|
|
|
+ Object fkColumnName = fkInfoMap.get(FK_COLUMN_NAME);
|
|
|
+ Object dkColumnName = fkInfoMap.get(DK_COLUMN_NAME);
|
|
|
+
|
|
|
+ // 到子表中查
|
|
|
+ JSONObject param = new JSONObject();
|
|
|
+ param.put(fkColumnName.toString(), value);
|
|
|
+ IBaseSelectService selectService = SpringUtils.getBean(IBaseSelectService.class);
|
|
|
+ JSONObject fkInfo = selectService.getOneByMap(fkTableName.toString(), param);
|
|
|
+ JSONObject result = new JSONObject();
|
|
|
+ if (isEmpty(fkInfo)) {
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ Object fkValue = fkInfo.get(dkColumnName);
|
|
|
+ result.put(SINGLE_OBJ_NAME, value);
|
|
|
+ result.put(SINGLE_OBJ_VALUE, fkValue);
|
|
|
+ result.put(FK_TABLE_NAME, fkTableName);
|
|
|
+ result.put(FK_COLUMN_NAME, fkColumnName);
|
|
|
+ result.put(DK_COLUMN_NAME, dkColumnName);
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
public static List<SysFile> getAnnex(String value) {
|
|
|
if (ArrayUtils.equalsEmptyArray(value)) {
|
|
|
return null;
|