yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

表单手册修订记录

Browse Source
This commit is contained in:
446052889@qq.com 2022-08-13 09:15:38 +08:00
parent 249433695a
commit 4fd85b40ac
6 changed files with 90 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar
View File

Binary file not shown.

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
View File

@ -3757,7 +3757,7 @@ public class CoeDesignerWeb extends ActionWeb {
* @param olduuid
*/
public String CreateincidenceRelation(boolean isLargeIteration,String olduuid,PALRepositoryModel newModel,Map<String, String> mapNewUUID,Double tempVer){
ResponseObject ro = null;
ResponseObject ro = ResponseObject.newOkResponse();
DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
List<DesignerShapeRelationModel> oldModelList = dao.getModelListByFileId(olduuid);
if(oldModelList.size()>0){

BIN
com.awspaas.user.apps.coe.pal.output.bd/lib/com.awspaas.user.apps.coe.pal.output.bd.jar
View File

Binary file not shown.

90
com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java
View File

@ -1,6 +1,7 @@
package com.awspaas.apps.coe.pal.output.bd.report1;
import java.io.File;
import java.sql.Timestamp;
import java.util.*;
import com.actionsoft.apps.coe.pal.constant.CoEConstant;
import com.actionsoft.apps.coe.pal.pal.output.extend.GenerLogExd;
@ -28,6 +29,7 @@ import com.actionsoft.bpms.server.DispatcherRequest;
import com.actionsoft.bpms.server.UserContext;
import com.actionsoft.bpms.server.fs.DCContext;
import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
import com.actionsoft.bpms.util.UtilDate;
import com.actionsoft.bpms.util.UtilFile;
import com.actionsoft.bpms.util.UtilString;
import com.actionsoft.sdk.local.SDK;
@ -52,6 +54,9 @@ public class Report1Gener {
public static final Object _lock = new Object();
private UserContext userContext = null;
GenerLogExd log = new GenerLogExd();
//word换行符
private final String WRAPSTRING = "</w:t></w:r></w:p><w:p><w:pPr><w:keepNext w:val=\"off\"/><w:keepLines w:val=\"off\"/><w:pageBreakBefore w:val=\"off\"/><w:widowControl/><w:kinsoku/><w:wordWrap/><w:overflowPunct/><w:topLinePunct w:val=\"off\"/><w:autoSpaceDE/><w:autoSpaceDN/><w:adjustRightInd/><w:snapToGrid/><w:spacing w:line=\"240\" w:line-rule=\"auto\"/><w:ind w:left=\"56\" w:right=\"0\" w:right-chars=\"0\" w:first-line=\"0\" w:first-line-chars=\"0\"/><w:jc w:val=\"both\"/><w:textAlignment w:val=\"auto\"/><w:outlineLvl w:val=\"9\"/><w:rPr><w:rFonts w:ascii=\"宋体\" w:h-ansi=\"宋体\" w:fareast=\"宋体\" w:cs=\"宋体\" w:hint=\"fareast\"/><w:color w:val=\"auto\"/><w:sz w:val=\"21\"/><w:sz-cs w:val=\"21\"/><w:lang w:val=\"EN-US\"/></w:rPr></w:pPr><w:r><w:rPr><w:rFonts w:ascii=\"宋体\" w:h-ansi=\"宋体\" w:fareast=\"宋体\" w:cs=\"宋体\" w:hint=\"fareast\"/><w:color w:val=\"auto\"/><w:sz w:val=\"21\"/><w:sz-cs w:val=\"21\"/><w:lang w:val=\"EN-US\"/></w:rPr><w:t>";
public Report1Gener() {
}
@ -266,7 +271,7 @@ public class Report1Gener {
OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr); //设置默认值
_tr.put(OutputWordUtil.SERIAL_NUMBER, index); //序号
_tr.put(OutputWordUtil.REPOSITORY_NAME, specialCharTransfer(repositoryModel.getName().replace("\n", ""))); //流程名称
_tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", OutputWordUtil.WRAPSTRING)); //步骤名称
_tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", WRAPSTRING)); //步骤名称
/**序号改为流程编号**/
/*_tr.put(OutputWordUtil.SERIAL_NUMBER, ""); //序号置空
@ -322,19 +327,19 @@ public class Report1Gener {
JSONObject obj = dataAttributes.getJSONObject(i);
String attrId = obj.getString("key");
String attrValue = obj.getString("value");
_tr.put("shape_" + attrId, attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
_tr.put("shape_" + attrId, attrValue.replace("\n", WRAPSTRING));
if (raciRelationType) {// 涉及部门、岗位/角色关联的是bpm组织部门、岗位、角色
if ("bpm_duty_r".equals(attrId)) {
_tr.put("shape_duty_r", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
_tr.put("shape_duty_r", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_approval_a".equals(attrId)) {
_tr.put("shape_approval_a", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
_tr.put("shape_approval_a", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_counselor_c".equals(attrId)) {
_tr.put("shape_counselor_c", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
_tr.put("shape_counselor_c", attrValue.replace("\n", WRAPSTRING));
}
if ("bpm_notify_i".equals(attrId)) {
_tr.put("shape_notify_i", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
_tr.put("shape_notify_i", attrValue.replace("\n", WRAPSTRING));
}
}
if ("danger".equals(attrId)) {
@ -361,8 +366,12 @@ public class Report1Gener {
dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);
ReportRepositoryCompare compare = new ReportRepositoryCompare();
JSONArray historyVersionModify = compare.getModifyVersionHistory(repositoryId);
dataMap.put("history_table", historyVersionModify);
// JSONArray historyVersionModify = compare.getModifyVersionHistory(repositoryId);
// dataMap.put("history_table", historyVersionModify);
// 修订记录
dataMap.put("version_history_table", getVersionHistoryTable(repositoryModel));
return dataMap;
}
@ -421,7 +430,7 @@ public class Report1Gener {
OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr); //设置默认值
String name = specialCharTransfer(shape.get("text").toString());
_tr.put("related_" + OutputWordUtil.SHAPE_NAME, processShapeName);
_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", WRAPSTRING));
_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
JSONArray dataAttributes = (JSONArray) shape.get("attributes");
for (int j = 0; j < dataAttributes.size(); j++) {
@ -481,7 +490,7 @@ public class Report1Gener {
JSONObject _tr = new JSONObject();
OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr); //设置默认值
String name = specialCharTransfer(shape.get("text").toString());
_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", WRAPSTRING));
_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
JSONArray dataAttributes = (JSONArray) shape.get("attributes");
for (int j = 0; j < dataAttributes.size(); j++) {
@ -494,4 +503,65 @@ public class Report1Gener {
}
/**
* 修订记录
* @param repositoryModel
* @return
*/
private JSONArray getVersionHistoryTable(PALRepositoryModel repositoryModel) {
JSONArray versionHistoryTable = new JSONArray();// 修订记录
List<PALRepositoryModel> list = PALRepositoryCache.getByVersionId(repositoryModel.getVersionId());
list.sort((m1, m2)-> {
return m1.getVersion() - m2.getVersion() > 0 ? 1 : -1;
});
for (PALRepositoryModel model : list) {
JSONObject obj = new JSONObject();
Map<String, JSONObject> map = PALRepositoryQueryAPIManager.queryRepositoryAttributeById(model.getId());
// 版本P_versions
String attr = "P_versions";
String val = "";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订单位Issuing_department
attr = "Issuing_department";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订人Drafted_and_revised_by
attr = "Drafted_and_revised_by";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 拟制/修订日期Drafted_and_revised_date
attr = "Drafted_and_revised_date";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
if (UtilString.isNotEmpty(val)) {
try {
Timestamp timestamp = UtilDate.parseTsFromDateTime(val);
val = UtilDate.yearFormat(timestamp) + "年" + Integer.parseInt(UtilDate.monthFormat(timestamp)) + "月" + UtilDate.dayFormat(timestamp) + "日";
} catch (Exception e) {
e.printStackTrace();
}
}
obj.put(attr, val);
// 审核人auditor
attr = "auditor";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 复核人reviewer
attr = "reviewer";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 审批人approver
attr = "approver";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
// 修订内容及理由Contents_and_reasons_for_revision
attr = "Contents_and_reasons_for_revision";
val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
obj.put(attr, val);
versionHistoryTable.add(obj);
}
return versionHistoryTable;
}
}

18
com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml
View File

@ -3974,7 +3974,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:p>
</w:tc>
</w:tr>
<#list history_table as table6>
<#list version_history_table as table6>
<w:tr wsp:rsidR="00B941E2">
<w:trPr>
<w:trHeight w:val="808"/>
@ -3999,7 +3999,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="007075FF">
<w:t>${table6.history_no}</w:t>
<w:t>${table6.P_versions}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4034,7 +4034,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:sz w:val="21"/>
<w:sz-cs w:val="21"/>
</w:rPr>
<w:t>${pl_Issuing_department}</w:t>
<w:t>${table6.Issuing_department}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4061,7 +4061,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_Drafted_and_revised_by}</w:t>
<w:t>${table6.Drafted_and_revised_by}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4088,7 +4088,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_Drafted_and_revised_date}</w:t>
<w:t>${table6.Drafted_and_revised_date}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4115,7 +4115,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_auditor}</w:t>
<w:t>${table6.auditor}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4142,7 +4142,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_reviewer}</w:t>
<w:t>${table6.reviewer}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4169,7 +4169,7 @@ y7fdOgAAAABJRU5ErkJggk==
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
<w:t>${pl_approver}</w:t>
<w:t>${table6.approver}</w:t>
</w:r>
</w:p>
</w:tc>
@ -4192,7 +4192,7 @@ y7fdOgAAAABJRU5ErkJggk==
</w:rPr>
</w:pPr>
<w:r wsp:rsidRPr="00CF65F2">
<w:t>${table6.history_modifyContent}</w:t>
<w:t>${table6.Contents_and_reasons_for_revision}</w:t>
</w:r>
</w:p>
</w:tc>