diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java index 3350491..627ef64 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java @@ -305,7 +305,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService, public CommonResult callback(QmsBpmDTO reqDTO) { JSONObject variables = reqDTO.getVariables(); - //流程状态 3-拒绝 1-通过 2-完成 4-取消流程 + //流程状态 1-提交(含退回) 4-取消流程 String PROCESS_STATUS = variables.getString(QmsBpmConstant.PROCESS_INSTANCE_VARIABLE_STATUS); String mainId = variables.getString("mainId"); JSONArray fieldExtensions = new JSONArray(); @@ -315,7 +315,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService, ReportDocumentMainDO entity = getReportDocumentMain(Long.valueOf(mainId)); log.error("流程回调:{}", JSONObject.toJSONString(reqDTO)); 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"; //判断是否最后一个节点 @@ -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 标识驳回到发起环节 if(variables.containsKey(returnFlagKey) && variables.getString(returnFlagKey).equals("true")){ - //拒绝(重制) - entity.setFlowStatus(QmsCommonConstant.REJECTED); + //驳回。流程需要配置退回到发起节点 + entity.setFlowStatus(QmsCommonConstant.VOID); entity.setDocumentSignature(""); - }else if("2".equals(PROCESS_STATUS)){ - //提交(审批中) - assembleSignature(currentActivityId, entity); - } - else if("4".equals(PROCESS_STATUS)){ + }else if("4".equals(PROCESS_STATUS)){ //作废 entity.setFlowStatus(QmsCommonConstant.VOID); entity.setDocumentSignature("");