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