zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:报告流程回调优化

Browse Source
This commit is contained in:
FCL
2025-11-03 14:00:36 +08:00
parent d218383a9a
commit b2e275a2d8
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java
View File

@@ -305,7 +305,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
public CommonResult<JSONObject> callback(QmsBpmDTO reqDTO) { public CommonResult<JSONObject> callback(QmsBpmDTO reqDTO) {
JSONObject variables = reqDTO.getVariables(); JSONObject variables = reqDTO.getVariables();
//流程状态 3-拒绝 1-通过 2-完成 4-取消流程 //流程状态 1-提交（含退回） 4-取消流程
String PROCESS_STATUS = variables.getString(QmsBpmConstant.PROCESS_INSTANCE_VARIABLE_STATUS); String PROCESS_STATUS = variables.getString(QmsBpmConstant.PROCESS_INSTANCE_VARIABLE_STATUS);
String mainId = variables.getString("mainId"); String mainId = variables.getString("mainId");
JSONArray fieldExtensions = new JSONArray(); JSONArray fieldExtensions = new JSONArray();
@@ -315,7 +315,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
ReportDocumentMainDO entity = getReportDocumentMain(Long.valueOf(mainId)); ReportDocumentMainDO entity = getReportDocumentMain(Long.valueOf(mainId));
log.error("流程回调：{}", JSONObject.toJSONString(reqDTO)); log.error("流程回调：{}", JSONObject.toJSONString(reqDTO));
String currentActivityId = variables.getString(QmsBpmConstant.BPM_CALLBACK_ACTIVITY_ID); String currentActivityId = variables.getString(QmsBpmConstant.BPM_CALLBACK_ACTIVITY_ID);
String RETURN_FLAG_PREFIX_KEY = variables.getString(QmsBpmConstant.BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY); String RETURN_FLAG_PREFIX_KEY = QmsBpmConstant.BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY;
String returnFlagKey = RETURN_FLAG_PREFIX_KEY + "Activity_001"; String returnFlagKey = RETURN_FLAG_PREFIX_KEY + "Activity_001";
//判断是否最后一个节点 //判断是否最后一个节点
@@ -333,19 +333,12 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
} }
} }
if(ObjectUtils.isEmpty(RETURN_FLAG_PREFIX_KEY) || "null".equals(RETURN_FLAG_PREFIX_KEY))
returnFlagKey = "false";
// if("3".equals(PROCESS_STATUS)){
//"RETURN_FLAG_Activity_001": true 标识驳回到发起环节 //"RETURN_FLAG_Activity_001": true 标识驳回到发起环节
if(variables.containsKey(returnFlagKey) && variables.getString(returnFlagKey).equals("true")){ if(variables.containsKey(returnFlagKey) && variables.getString(returnFlagKey).equals("true")){
//拒绝（重制） //驳回。流程需要配置退回到发起节点
entity.setFlowStatus(QmsCommonConstant.REJECTED); entity.setFlowStatus(QmsCommonConstant.VOID);
entity.setDocumentSignature(""); entity.setDocumentSignature("");
}else if("2".equals(PROCESS_STATUS)){ }else if("4".equals(PROCESS_STATUS)){
//提交（审批中）
assembleSignature(currentActivityId, entity);
}
else if("4".equals(PROCESS_STATUS)){
//作废 //作废
entity.setFlowStatus(QmsCommonConstant.VOID); entity.setFlowStatus(QmsCommonConstant.VOID);
entity.setDocumentSignature(""); entity.setDocumentSignature("");