|
|
|
@ -565,6 +565,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
* */ |
|
|
|
} |
|
|
|
} |
|
|
|
//数据标题TreeMap排序
|
|
|
|
public static CustomerFormTableSingleFieldValue generateCustomerFormTableSingleFieldValue(TreeMap<String, Object> treeMap) { |
|
|
|
TreeMap<String,Object> treeMapx = new TreeMap<>(); |
|
|
|
treeMapx.putAll(treeMap); |
|
|
|
@ -577,6 +578,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
String label = labelBuilder.toString().substring(0, labelBuilder.length() - 1); |
|
|
|
return new CustomerFormTableSingleFieldValue(lastValue, label); |
|
|
|
} |
|
|
|
//数据标题截取最后一个空格
|
|
|
|
public static String removeAfterLastSpace(String str) { |
|
|
|
int lastSpaceIndex = str.lastIndexOf(' '); |
|
|
|
if (lastSpaceIndex!= -1) { |
|
|
|
@ -602,7 +604,10 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
String[] titleArr = title.split(":"); |
|
|
|
toSelectDataTitles.add(titleArr[2]); |
|
|
|
} |
|
|
|
|
|
|
|
//如果被关联的表单暂未配置dataTitle,则默认id
|
|
|
|
if(toSelectDataTitles.size()==0){ |
|
|
|
toSelectDataTitles.add("id"); |
|
|
|
} |
|
|
|
List<TreeMap<String, Object>> dataTitleMapList = fieldRecordMapper.getDataTitles(asfFormName,toSelectDataTitles); |
|
|
|
|
|
|
|
// 自定义比较器用以排序dataTitleMapList
|
|
|
|
|