|
|
|
@ -586,18 +586,26 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
} |
|
|
|
return str; |
|
|
|
} |
|
|
|
|
|
|
|
/* |
|
|
|
form |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public ArrayList<CustomerFormTableSingleFieldValue> getAsfDataTitles(String formId, String dataTitle,String rangeFormula, String rangeString, String hideFormula, String hideString) { |
|
|
|
//关联表单的id
|
|
|
|
String AsfFormId = formId; |
|
|
|
//根据formId(cfid)查询关联表单表名
|
|
|
|
String asfFormName = customerFormViewMapper.getTableNameByCfid(formId).getTablekey(); |
|
|
|
String asfFormName = customerFormViewMapper.getTableNameByCfid(AsfFormId).getTablekey(); |
|
|
|
//查询关联表单的数据标题
|
|
|
|
String mastesformjson = customerFormViewMapper.getTableNameByCfid(formId).getMastesformjson(); |
|
|
|
String mastesformjson = customerFormViewMapper.getTableNameByCfid(AsfFormId).getMastesformjson(); |
|
|
|
com.alibaba.fastjson2.JSONObject jsonObject = JSON.parseObject(mastesformjson); |
|
|
|
JSONArray dataTitleJsonArray = jsonObject.getJSONObject("form").getJSONArray("dataTitle"); |
|
|
|
List<String> dataTitleArray = dataTitleJsonArray.toJavaList(String.class); |
|
|
|
List<String> dataTitleArray = new ArrayList<>(); |
|
|
|
if(jsonObject.getJSONObject("form").getJSONArray("dataTitle")==null){ |
|
|
|
dataTitleArray.add("aaa:aaa:id"); |
|
|
|
}else{ |
|
|
|
dataTitleArray = dataTitleJsonArray.toJavaList(String.class); |
|
|
|
} |
|
|
|
|
|
|
|
//关联表单的数据标题list
|
|
|
|
ArrayList<String> toSelectDataTitles = new ArrayList<>(); |
|
|
|
for(String title : dataTitleArray){ |
|
|
|
|