制度手册术语,适用范围异常处理
This commit is contained in:
parent
21f6bf8a5e
commit
130d37e7cd
@ -531,10 +531,8 @@ public class Report1Gener {
|
||||
Map<String, String> contentMap = getContentData(repositoryId, controlShapeId);
|
||||
String listDef = contentMap.get("listDef");
|
||||
String contentXml = contentMap.get("content");
|
||||
|
||||
// 流程步骤的指标表格
|
||||
setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap);
|
||||
|
||||
if (search != null && search.size() > 0) {
|
||||
// 复制附件
|
||||
// int index = 1;
|
||||
@ -566,6 +564,7 @@ public class Report1Gener {
|
||||
}
|
||||
JSONArray termTable = new JSONArray(); //术语定义Table
|
||||
// 属性特征 属性代码KEY
|
||||
try {
|
||||
PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term");
|
||||
String termVal = term.getPropertyValue();
|
||||
JSONObject termObj = JSONObject.parseObject(termVal);
|
||||
@ -585,29 +584,37 @@ public class Report1Gener {
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// TODO: handle exception
|
||||
}
|
||||
|
||||
JSONArray organizationTable = new JSONArray(); //组织职责Table
|
||||
// 属性特征 属性代码KEY
|
||||
PALRepositoryPropertyModel Organizational = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"Organizational_role");
|
||||
String OrganizationalVal = Organizational.getPropertyValue();
|
||||
JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal);
|
||||
if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) {
|
||||
JSONArray tableArr = OrganizationalObj.getJSONArray("table");
|
||||
if (tableArr != null && !tableArr.isEmpty()) {
|
||||
for (Object obj : tableArr) {
|
||||
JSONObject obj2 = (JSONObject) obj;
|
||||
if (!"table_head".equals(obj2.getString("id"))) {
|
||||
String name = obj2.getString("name");
|
||||
String desc = obj2.getString("desc");
|
||||
JSONObject tmp = new JSONObject();
|
||||
tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING));
|
||||
tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING));
|
||||
organizationTable.add(tmp);
|
||||
try {
|
||||
PALRepositoryPropertyModel Organizational = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"Organizational_role");
|
||||
String OrganizationalVal = Organizational.getPropertyValue();
|
||||
JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal);
|
||||
if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) {
|
||||
JSONArray tableArr = OrganizationalObj.getJSONArray("table");
|
||||
if (tableArr != null && !tableArr.isEmpty()) {
|
||||
for (Object obj : tableArr) {
|
||||
JSONObject obj2 = (JSONObject) obj;
|
||||
if (!"table_head".equals(obj2.getString("id"))) {
|
||||
String name = obj2.getString("name");
|
||||
String desc = obj2.getString("desc");
|
||||
JSONObject tmp = new JSONObject();
|
||||
tmp.put("name", specialCharTransfer(name).replace("\n", WRAPSTRING));
|
||||
tmp.put("desc", specialCharTransfer(desc).replace("\n", WRAPSTRING));
|
||||
organizationTable.add(tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// TODO: handle exception
|
||||
}
|
||||
|
||||
|
||||
//支持文件
|
||||
JSONArray support_files = new JSONArray(); //组织职责Table
|
||||
List<DesignerShapeRelationModel> relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files");
|
||||
@ -745,7 +752,7 @@ public class Report1Gener {
|
||||
Timestamp timestamp = UtilDate.parseTsFromDateTime(val);
|
||||
val = UtilDate.yearFormat(timestamp) + "年" + Integer.parseInt(UtilDate.monthFormat(timestamp)) + "月" + UtilDate.dayFormat(timestamp) + "日";
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
//e.printStackTrace();
|
||||
}
|
||||
}
|
||||
obj.put(attr, val);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user