diff --git a/nanopart-server/src/test/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandlerTest.java b/nanopart-server/src/test/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandlerTest.java index ff72db4c..04cb8b38 100644 --- a/nanopart-server/src/test/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandlerTest.java +++ b/nanopart-server/src/test/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandlerTest.java @@ -21,256 +21,199 @@ class CompleteVisaChangeStampHandlerTest { @Test void exec() { ProcessInstanceDTO dto = JSON.parseObject("{\n" + - " \"businessKey\": \"955\",\n" + - " \"businessProcessInstanceName\": \"变更签证用印审批\",\n" + - " \"category\": \"bgqzyy\",\n" + - " \"currentElementKey\": \"撤回流程实例无节点信息\",\n" + - " \"initiator\": {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": \"王自强\",\n" + - " \"avatar\": \"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\",\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"9000400420\",\n" + - " \"tenantId\": \"4777\"\n" + - " },\n" + - " \"lastOperationAssigner\": {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": \"王自强\",\n" + - " \"avatar\": \"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\",\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"9000400420\",\n" + - " \"tenantId\": \"4777\"\n" + - " },\n" + - " \"noticeConf\": {\n" + - " \"carbonCopy\": {\n" + - " \"carbonCopyMessageId\": \"8733f93de8db49699a78eda5a342763c\",\n" + - " \"viewJson\": \"{\\\"templateName\\\":\\\"审批流抄送通用模板\\\",\\\"templateCode\\\":\\\"8733f93de8db49699a78eda5a342763c\\\"}\"\n" + - " },\n" + - " \"notice\": {\n" + - " \"assigners\": {\n" + - " \"selected\": false,\n" + - " \"viewJson\": null\n" + - " },\n" + - " \"histories\": {\n" + - " \"selected\": false,\n" + - " \"viewJson\": null\n" + - " },\n" + - " \"initiator\": {\n" + - " \"selected\": false,\n" + - " \"viewJson\": null\n" + - " },\n" + - " \"noticeMessageId\": null,\n" + - " \"positions\": {\n" + - " \"selected\": false,\n" + - " \"viewJson\": null\n" + - " },\n" + - " \"roles\": {\n" + - " \"selected\": false,\n" + - " \"viewJson\": null\n" + - " },\n" + - " \"sendMessage\": null,\n" + - " \"triggerEvents\": []\n" + - " },\n" + - " \"pending\": {\n" + - " \"pendingMessageId\": \"95c89a0db50c48fe9956068090b63ffb\",\n" + - " \"viewJson\": \"{\\\"templateName\\\":\\\"变更签证用印审批待办\\\",\\\"templateCode\\\":\\\"95c89a0db50c48fe9956068090b63ffb\\\",\\\"category\\\":\\\"APPROVAL_PENDING_MESSAGE\\\",\\\"title\\\":\\\"变更签证用印申请\\\",\\\"content\\\":\\\"${initiatorName}发起了一个“${visaType}用印申请，请前往审批\\\",\\\"groupNodeNamePaths\\\":[\\\"SaaS待办中心/变更签证管理/用印\\\"],\\\"status\\\":\\\"ENABLE\\\",\\\"createPersonId\\\":290752,\\\"createPersonName\\\":\\\"马翔\\\",\\\"updatePersonId\\\":9100404971,\\\"updatePersonName\\\":\\\"马翔\\\",\\\"styleType\\\":{\\\"code\\\":\\\"FLOW_COMMON\\\",\\\"category\\\":\\\"APPROVAL_PENDING_MESSAGE\\\",\\\"name\\\":\\\"样式2001（审批详情页通用样式）\\\",\\\"url\\\":null},\\\"pushData\\\":{\\\"switchOn\\\":false,\\\"ability\\\":[],\\\"type\\\":\\\"\\\",\\\"voiceType\\\":\\\"\\\"}}\"\n" + - " },\n" + - " \"sms\": {\n" + - " \"smsId\": \"\",\n" + - " \"viewJson\": null\n" + - " }\n" + - " },\n" + - " \"processDefinitionId\": \"bgqzyy:4:202503052021100000009\",\n" + - " \"processDefinitionKey\": \"bgqzyy\",\n" + - " \"processDefinitionVersion\": 4,\n" + - " \"processInstanceId\": \"202504281417200000000\",\n" + - " \"reason\": null,\n" + - " \"signConf\": null,\n" + - " \"startTime\": 1745821048696,\n" + - " \"tenantId\": \"4773\",\n" + - " \"type\": \"PROCESS_INSTANCE_COMPLETED\",\n" + - " \"variables\": {\n" + - " \"no\": \"428发起1\",\n" + - " \"reason\": \"发生原因\",\n" + - " \"initiatorUnitName\": \"北京天健志诚科技有限公司北京天健志诚科技有限公司\",\n" + - " \"[_INTERNAL_INITIATOR_]\": \"{\\\"assignerName\\\":\\\"王自强\\\",\\\"avatar\\\":\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\\\",\\\"ouId\\\":\\\"10017\\\",\\\"personId\\\":\\\"9000400420\\\",\\\"tenantId\\\":\\\"4777\\\"}\",\n" + - " \"[_ASSIGNEE_INFO_]202504281417200000054\": \"{\\\"assignerName\\\":\\\"王自强\\\",\\\"avatar\\\":\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\\\",\\\"ouId\\\":\\\"10017\\\",\\\"personId\\\":\\\"9000400420\\\",\\\"tenantId\\\":\\\"4777\\\"}\",\n" + - " \"[_INITIATOR_SPECIFY_]\": {\n" + - " \"node_289121268979\": [\n" + - " {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": null,\n" + - " \"avatar\": null,\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"9000400420\",\n" + - " \"tenantId\": \"4773\"\n" + - " },\n" + - " {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": null,\n" + - " \"avatar\": null,\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"89511\",\n" + - " \"tenantId\": \"4773\"\n" + - " },\n" + - " {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": null,\n" + - " \"avatar\": null,\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"80792\",\n" + - " \"tenantId\": \"4773\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " \"[_ASSIGNEE_INFO_]202504281417200000093\": \"{\\\"ouId\\\":\\\"10017\\\",\\\"personId\\\":\\\"89511\\\",\\\"tenantId\\\":\\\"4773\\\"}\",\n" + - " \"stampType\": \"OFFICIAL\",\n" + - " \"[_ASSIGNEE_LIST_INFO_]node_289121268979\": [\n" + - " \"10017|80792\",\n" + - " \"10017|89511\",\n" + - " \"10017|9000400420\"\n" + - " ],\n" + - " \"[_INTERNAL_PROCESS_BIZ_TYPE]\": \"approval\",\n" + - " \"[_INTERNAL_PROCESS_AGENT]\": false,\n" + - " \"[_PROCESS_OWNERSHIP_APPLICATION_]\": \"nanopart\",\n" + - " \"visaTypeDesc\": \"设计变更\",\n" + - " \"activityEnd:node_289121268979\": true,\n" + - " \"stampOuId\": 10017,\n" + - " \"unitPerson\": [\n" + - " {\n" + - " \"unit\": \"北京天健志诚科技有限公司北京天健志诚科技有限公司(默认单位)\",\n" + - " \"person\": \"尉丽丽-总包测试岗位\"\n" + - " }\n" + - " ],\n" + - " \"pdfFileUrl\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/51c4f4b4a9984c4099c6832f5c46fba4.pdf\",\n" + - " \"workspaceName\": \"北京项目部服务包北京项目部服务包北京项目部服务包北京项目部服务包北京项目部服务包\",\n" + - " \"attach\": \"[{\\\"fileName\\\":\\\"image.jpg\\\",\\\"fileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/7c7a3c7b759d4a27b91664a2c9939483.jpg\\\",\\\"fileKey\\\":null}]\",\n" + - " \"_TASK_COMPLETE_TYPE202504281417200000054\": \"APPROVED\",\n" + - " \"stampContractId\": \"yDtB0UUckpxa9adbUEY6tcpCXkdKphcw\",\n" + - " \"happenTime\": \"2025.04.28\",\n" + - " \"[_ASSIGNEE_INFO_]202504281417200000100\": \"{\\\"ouId\\\":\\\"10017\\\",\\\"personId\\\":\\\"9000400420\\\",\\\"tenantId\\\":\\\"4773\\\"}\",\n" + - " \"[_ACTIVITY_INFO_SNAPSHOT_]node_289121268979\": [\n" + - " {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": null,\n" + - " \"avatar\": null,\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"80792\",\n" + - " \"tenantId\": \"4773\"\n" + - " },\n" + - " {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": null,\n" + - " \"avatar\": null,\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"89511\",\n" + - " \"tenantId\": \"4773\"\n" + - " },\n" + - " {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": null,\n" + - " \"avatar\": null,\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"9000400420\",\n" + - " \"tenantId\": \"4773\"\n" + - " }\n" + - " ],\n" + - " \"[_ACTIVITY_INFO_SNAPSHOT_]NODE_STARTER\": [\n" + - " {\n" + - " \"assignee\": null,\n" + - " \"assigneeType\": null,\n" + - " \"assignerName\": \"王自强\",\n" + - " \"avatar\": \"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\",\n" + - " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"9000400420\",\n" + - " \"tenantId\": \"4777\"\n" + - " }\n" + - " ],\n" + - " \"[_ASSIGNEE_INFO_]202504281417200000086\": \"{\\\"ouId\\\":\\\"10017\\\",\\\"personId\\\":\\\"80792\\\",\\\"tenantId\\\":\\\"4773\\\"}\",\n" + - " \"[_SIGNATURE_COLLECTION_]\": [\n" + - " {\n" + - " \"activityId\": \"NODE_STARTER\",\n" + - " \"activityName\": \"发起人\",\n" + - " \"signatures\": []\n" + - " },\n" + - " {\n" + - " \"activityId\": \"node_289121268979\",\n" + - " \"activityName\": \"业务节点\",\n" + - " \"signatures\": []\n" + - " }\n" + - " ],\n" + - " \"relationArea\": \"\",\n" + - " \"visaId\": 955,\n" + - " \"[_INTERNAL_PROCESS_WORKSPACE_TYPE]\": 1,\n" + - " \"initiatorName\": \"王自强\",\n" + - " \"[_CLOSE_PROCESS_ASSIGNER_]\": {\n" + + " \"businessKey\": \"904\",\n" + + " \"businessProcessInstanceName\": \"变更签证用印审批\",\n" + + " \"category\": \"bgqzyy\",\n" + + " \"currentElementKey\": \"驳回流程实例无节点信息\",\n" + + " \"initiator\": {\n" + " \"assignee\": null,\n" + " \"assigneeType\": null,\n" + - " \"assignerName\": \"王自强\",\n" + - " \"avatar\": \"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\",\n" + + " \"assignerName\": \"宋爱弟\",\n" + + " \"avatar\": \"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/b048b3d99ef048739a258e48f7feb3dd.jpg\",\n" + " \"nodeId\": null,\n" + - " \"ouId\": \"10017\",\n" + - " \"personId\": \"9000400420\",\n" + - " \"tenantId\": \"4777\"\n" + + " \"ouId\": \"6158\",\n" + + " \"personId\": \"9000398967\",\n" + + " \"tenantId\": \"400\"\n" + " },\n" + - " \"[_CREATE_INSTANCE_PARAMS]\": \"{\\\"processDefinitionKey\\\":\\\"bgqzyy\\\",\\\"tenantId\\\":\\\"4773\\\",\\\"specifyAssignerMap\\\":{\\\"node_289121268979\\\":[{\\\"personId\\\":\\\"9000400420\\\",\\\"tenantId\\\":\\\"4773\\\",\\\"ouId\\\":\\\"10017\\\"},{\\\"personId\\\":\\\"89511\\\",\\\"tenantId\\\":\\\"4773\\\",\\\"ouId\\\":\\\"10017\\\"},{\\\"personId\\\":\\\"80792\\\",\\\"tenantId\\\":\\\"4773\\\",\\\"ouId\\\":\\\"10017\\\"}]},\\\"variables\\\":{\\\"visaId\\\":955,\\\"stampOuId\\\":10017,\\\"topic\\\":\\\"428发起1\\\",\\\"initiatorUnitName\\\":\\\"北京天健志诚科技有限公司北京天健志诚科技有限公司\\\",\\\"stampType\\\":\\\"OFFICIAL\\\",\\\"stampTypeDesc\\\":\\\"公章\\\",\\\"stampRecipient\\\":\\\"yDtB0UUckpxa9adaUEY6tcpSblccTwmN\\\",\\\"stampContractId\\\":\\\"yDtB0UUckpxa9adbUEY6tcpCXkdKphcw\\\",\\\"pdfFileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/51c4f4b4a9984c4099c6832f5c46fba4.pdf\\\",\\\"initiatorName\\\":\\\"王自强\\\",\\\"visaType\\\":\\\"DESIGN_CHANGE\\\",\\\"visaTypeDesc\\\":\\\"设计变更\\\",\\\"[_INTERNAL_PROCESS_WORKSPACE_TYPE]\\\":1,\\\"[_INTERNAL_PROCESS_BIZ_TYPE]\\\":\\\"approval\\\",\\\"[_INTERNAL_INITIATOR_]\\\":\\\"{\\\\\\\"assignerName\\\\\\\":\\\\\\\"王自强\\\\\\\",\\\\\\\"avatar\\\\\\\":\\\\\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\\\\\\\",\\\\\\\"ouId\\\\\\\":\\\\\\\"10017\\\\\\\",\\\\\\\"personId\\\\\\\":\\\\\\\"9000400420\\\\\\\",\\\\\\\"tenantId\\\\\\\":\\\\\\\"4777\\\\\\\"}\\\",\\\"[_BIZ_ORG_RELATION_]\\\":{},\\\"[_WORKFLOW_ENGINE_VERSION_]\\\":\\\"1.5.2\\\",\\\"[_PENDING_VARIABLES]\\\":{\\\"visaId\\\":955,\\\"stampOuId\\\":10017,\\\"topic\\\":\\\"428发起1\\\",\\\"initiatorUnitName\\\":\\\"北京天健志诚科技有限公司北京天健志诚科技有限公司\\\",\\\"stampType\\\":\\\"OFFICIAL\\\",\\\"stampTypeDesc\\\":\\\"公章\\\",\\\"stampRecipient\\\":\\\"yDtB0UUckpxa9adaUEY6tcpSblccTwmN\\\",\\\"stampContractId\\\":\\\"yDtB0UUckpxa9adbUEY6tcpCXkdKphcw\\\",\\\"pdfFileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/51c4f4b4a9984c4099c6832f5c46fba4.pdf\\\",\\\"initiatorName\\\":\\\"王自强\\\",\\\"visaType\\\":\\\"DESIGN_CHANGE\\\",\\\"visaTypeDesc\\\":\\\"设计变更\\\"},\\\"[_INTERNAL_PROCESS_AGENT]\\\":false,\\\"[_PROCESS_OWNERSHIP_APPLICATION_]\\\":\\\"nanopart\\\",\\\"[_INITIATOR_SPECIFY_]\\\":{\\\"node_289121268979\\\":[{\\\"personId\\\":\\\"9000400420\\\",\\\"tenantId\\\":\\\"4773\\\",\\\"ouId\\\":\\\"10017\\\"},{\\\"personId\\\":\\\"89511\\\",\\\"tenantId\\\":\\\"4773\\\",\\\"ouId\\\":\\\"10017\\\"},{\\\"personId\\\":\\\"80792\\\",\\\"tenantId\\\":\\\"4773\\\",\\\"ouId\\\":\\\"10017\\\"}]}},\\\"signVariables\\\":{},\\\"pendingVariables\\\":{\\\"visaId\\\":955,\\\"stampOuId\\\":10017,\\\"topic\\\":\\\"428发起1\\\",\\\"initiatorUnitName\\\":\\\"北京天健志诚科技有限公司北京天健志诚科技有限公司\\\",\\\"stampType\\\":\\\"OFFICIAL\\\",\\\"stampTypeDesc\\\":\\\"公章\\\",\\\"stampRecipient\\\":\\\"yDtB0UUckpxa9adaUEY6tcpSblccTwmN\\\",\\\"stampContractId\\\":\\\"yDtB0UUckpxa9adbUEY6tcpCXkdKphcw\\\",\\\"pdfFileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/51c4f4b4a9984c4099c6832f5c46fba4.pdf\\\",\\\"initiatorName\\\":\\\"王自强\\\",\\\"visaType\\\":\\\"DESIGN_CHANGE\\\",\\\"visaTypeDesc\\\":\\\"设计变更\\\"},\\\"cooperationOrg\\\":{},\\\"businessKey\\\":\\\"955\\\",\\\"initiator\\\":{\\\"assignerName\\\":\\\"王自强\\\",\\\"personId\\\":\\\"9000400420\\\",\\\"tenantId\\\":\\\"4777\\\",\\\"ouId\\\":\\\"10017\\\",\\\"avatar\\\":\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/caee25988c2b421ab5a20a710fe6e7a1.jpg\\\"},\\\"async\\\":false,\\\"startFormVariables\\\":{\\\"no\\\":\\\"428发起1\\\",\\\"reason\\\":\\\"发生原因\\\",\\\"relationArea\\\":\\\"\\\",\\\"contractNo\\\":\\\"合同编号\\\",\\\"unitPerson\\\":[{\\\"unit\\\":\\\"北京天健志诚科技有限公司北京天健志诚科技有限公司(默认单位)\\\",\\\"person\\\":\\\"尉丽丽-总包测试岗位\\\"}],\\\"amountChange\\\":\\\"减少15.00元\\\",\\\"relationProfessional\\\":\\\"\\\",\\\"topic\\\":\\\"428发起1\\\",\\\"contextDescription\\\":[{\\\"context\\\":{\\\"fileName\\\":\\\"image.jpg\\\",\\\"fileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/b1d6d4185be44b8e9f51b814ffe4aee1.jpg\\\",\\\"fileKey\\\":\\\"b1d6d4185be44b8e9f51b814ffe4aee1\\\"},\\\"description\\\":\\\"发生内容\\\"}],\\\"workspaceName\\\":\\\"北京项目部服务包北京项目部服务包北京项目部服务包北京项目部服务包北京项目部服务包\\\",\\\"contractName\\\":\\\"合同名称\\\",\\\"attach\\\":[{\\\"fileName\\\":\\\"image.jpg\\\",\\\"fileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/7c7a3c7b759d4a27b91664a2c9939483.jpg\\\"}],\\\"happenTime\\\":\\\"2025.04.28\\\",\\\"relationProject\\\":\\\"北京的项目改名为北京的工程\\\"}}\",\n" + - " \"visaType\": \"DESIGN_CHANGE\",\n" + - " \"stampRecipient\": \"yDtB0UUckpxa9adaUEY6tcpSblccTwmN\",\n" + - " \"[_BIZ_ORG_RELATION_]\": {\n" + - " \"orgScopes\": [],\n" + - " \"workerTeamScopes\": []\n" + + " \"lastOperationAssigner\": {\n" + + " \"assignee\": \"2008269\",\n" + + " \"assigneeType\": \"3\",\n" + + " \"assignerName\": \"高志鹏\",\n" + + " \"avatar\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/banner/banner_test/5c441569ee524c208295de72b64863d4.jpg\",\n" + + " \"nodeId\": null,\n" + + " \"ouId\": \"6158\",\n" + + " \"personId\": \"9000400266\",\n" + + " \"tenantId\": \"400\"\n" + " },\n" + - " \"[_WORKFLOW_ENGINE_VERSION_]\": \"1.5.2\",\n" + - " \"stampTypeDesc\": \"公章\",\n" + - " \"amountChange\": \"减少15.00元\",\n" + - " \"relationProfessional\": \"\",\n" + - " \"topic\": \"428发起1\",\n" + - " \"contextDescription\": [\n" + - " {\n" + - " \"context\": {\n" + - " \"fileName\": \"image.jpg\",\n" + - " \"fileUrl\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/b1d6d4185be44b8e9f51b814ffe4aee1.jpg\",\n" + - " \"fileKey\": \"b1d6d4185be44b8e9f51b814ffe4aee1\"\n" + + " \"noticeConf\": {\n" + + " \"carbonCopy\": {\n" + + " \"carbonCopyMessageId\": \"8733f93de8db49699a78eda5a342763c\",\n" + + " \"viewJson\": \"{\\\"templateName\\\":\\\"审批流抄送通用模板\\\",\\\"templateCode\\\":\\\"8733f93de8db49699a78eda5a342763c\\\"}\"\n" + + " },\n" + + " \"notice\": {\n" + + " \"assigners\": {\n" + + " \"selected\": false,\n" + + " \"viewJson\": null\n" + " },\n" + - " \"description\": \"发生内容\"\n" + + " \"histories\": {\n" + + " \"selected\": false,\n" + + " \"viewJson\": null\n" + + " },\n" + + " \"initiator\": {\n" + + " \"selected\": false,\n" + + " \"viewJson\": null\n" + + " },\n" + + " \"noticeMessageId\": null,\n" + + " \"positions\": {\n" + + " \"selected\": false,\n" + + " \"viewJson\": null\n" + + " },\n" + + " \"roles\": {\n" + + " \"selected\": false,\n" + + " \"viewJson\": null\n" + + " },\n" + + " \"sendMessage\": null,\n" + + " \"triggerEvents\": []\n" + + " },\n" + + " \"pending\": {\n" + + " \"pendingMessageId\": \"95c89a0db50c48fe9956068090b63ffb\",\n" + + " \"viewJson\": \"{\\\"templateName\\\":\\\"变更签证用印审批待办\\\",\\\"templateCode\\\":\\\"95c89a0db50c48fe9956068090b63ffb\\\",\\\"category\\\":\\\"APPROVAL_PENDING_MESSAGE\\\",\\\"title\\\":\\\"变更签证用印申请\\\",\\\"content\\\":\\\"${initiatorName}发起了一个“${visaType}用印申请，请前往审批\\\",\\\"groupNodeNamePaths\\\":[\\\"SaaS待办中心/变更签证管理/用印\\\"],\\\"status\\\":\\\"ENABLE\\\",\\\"createPersonId\\\":290752,\\\"createPersonName\\\":\\\"马翔\\\",\\\"updatePersonId\\\":9100404971,\\\"updatePersonName\\\":\\\"马翔\\\",\\\"styleType\\\":{\\\"code\\\":\\\"FLOW_COMMON\\\",\\\"category\\\":\\\"APPROVAL_PENDING_MESSAGE\\\",\\\"name\\\":\\\"样式2001（审批详情页通用样式）\\\",\\\"url\\\":null},\\\"pushData\\\":{\\\"switchOn\\\":false,\\\"ability\\\":[],\\\"type\\\":\\\"\\\",\\\"voiceType\\\":\\\"\\\"}}\"\n" + + " },\n" + + " \"sms\": {\n" + + " \"smsId\": \"\",\n" + + " \"viewJson\": null\n" + " }\n" + - " ],\n" + - " \"_TASK_COMPLETE_TYPE202504281417200000100\": \"APPROVED\",\n" + - " \"[_PENDING_VARIABLES]\": {\n" + - " \"visaId\": 955,\n" + - " \"stampOuId\": 10017,\n" + - " \"topic\": \"428发起1\",\n" + - " \"initiatorUnitName\": \"北京天健志诚科技有限公司北京天健志诚科技有限公司\",\n" + - " \"stampType\": \"OFFICIAL\",\n" + - " \"stampTypeDesc\": \"公章\",\n" + - " \"stampRecipient\": \"yDtB0UUckpxa9adaUEY6tcpSblccTwmN\",\n" + - " \"stampContractId\": \"yDtB0UUckpxa9adbUEY6tcpCXkdKphcw\",\n" + - " \"pdfFileUrl\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/h5/h5/51c4f4b4a9984c4099c6832f5c46fba4.pdf\",\n" + - " \"initiatorName\": \"王自强\",\n" + - " \"visaType\": \"DESIGN_CHANGE\",\n" + - " \"visaTypeDesc\": \"设计变更\"\n" + " },\n" + - " \"relationProject\": \"北京的项目改名为北京的工程\"\n" + - " },\n" + - " \"workflowEngineVersion\": \"1.5.2\"\n" + - "}", ProcessInstanceDTO.class); + " \"processDefinitionId\": \"bgqzyy:4:202503052021100000009\",\n" + + " \"processDefinitionKey\": \"bgqzyy\",\n" + + " \"processDefinitionVersion\": 4,\n" + + " \"processInstanceId\": \"202504291615200000000\",\n" + + " \"reason\": \"\",\n" + + " \"signConf\": null,\n" + + " \"startTime\": 1745914538900,\n" + + " \"tenantId\": \"398\",\n" + + " \"type\": \"PROCESS_INSTANCE_REJECTED\",\n" + + " \"variables\": {\n" + + " \"reason\": \"123\",\n" + + " \"no\": \"123\",\n" + + " \"[_INTERNAL_INITIATOR_]\": \"{\\\"assignerName\\\":\\\"宋爱弟\\\",\\\"avatar\\\":\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/b048b3d99ef048739a258e48f7feb3dd.jpg\\\",\\\"ouId\\\":\\\"6158\\\",\\\"personId\\\":\\\"9000398967\\\",\\\"tenantId\\\":\\\"400\\\"}\",\n" + + " \"initiatorUnitName\": \"四川星腾贸易有限公司\",\n" + + " \"_TASK_COMPLETE_TYPE202504291615200000053\": \"APPROVED\",\n" + + " \"[_INITIATOR_SPECIFY_]\": {\n" + + " \"node_289121268979\": [\n" + + " {\n" + + " \"assignee\": null,\n" + + " \"assigneeType\": null,\n" + + " \"assignerName\": null,\n" + + " \"avatar\": null,\n" + + " \"nodeId\": null,\n" + + " \"ouId\": \"6158\",\n" + + " \"personId\": \"9000400266\",\n" + + " \"tenantId\": \"398\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " \"[_INTERNAL_PROCESS_DELETE_REASON_]\": \"\",\n" + + " \"[_ASSIGNEE_LIST_INFO_]node_289121268979\": [\n" + + " \"6158|9000400266\"\n" + + " ],\n" + + " \"stampType\": \"OFFICIAL\",\n" + + " \"[_ASSIGNEE_INFO_]202504291615200000081\": \"{\\\"ouId\\\":\\\"6158\\\",\\\"personId\\\":\\\"9000400266\\\",\\\"tenantId\\\":\\\"398\\\"}\",\n" + + " \"[_INTERNAL_PROCESS_BIZ_TYPE]\": \"approval\",\n" + + " \"[_INTERNAL_PROCESS_AGENT]\": false,\n" + + " \"[_PROCESS_OWNERSHIP_APPLICATION_]\": \"nanopart\",\n" + + " \"visaTypeDesc\": \"设计变更\",\n" + + " \"[_PROCESS_CLOSING_TYPE]\": \"REJECTED\",\n" + + " \"[_INTERNAL_DELETE_PROCESS_FLAG_]\": \"[_INTERNAL_PROCESS_TYPE_REJECT_]\",\n" + + " \"[_ASSIGNEE_INFO_]202504291615200000053\": \"{\\\"assignerName\\\":\\\"宋爱弟\\\",\\\"avatar\\\":\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/b048b3d99ef048739a258e48f7feb3dd.jpg\\\",\\\"ouId\\\":\\\"6158\\\",\\\"personId\\\":\\\"9000398967\\\",\\\"tenantId\\\":\\\"400\\\"}\",\n" + + " \"unitPerson\": [\n" + + " {\n" + + " \"unit\": \"四川星腾贸易有限公司(总包单位)\",\n" + + " \"person\": \"张鹏辉-职员\"\n" + + " }\n" + + " ],\n" + + " \"stampOuId\": 6158,\n" + + " \"pdfFileUrl\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/cms/cms_test/55bc64fb1a3e4185a0bb076fef0267e9.pdf\",\n" + + " \"workspaceName\": \"test-0925项目2\",\n" + + " \"attach\": \"null\",\n" + + " \"stampContractId\": \"yDtB3UUckpxbd98wUxfgmNJRzSKgRqTy\",\n" + + " \"happenTime\": \"2025.04.25\",\n" + + " \"[_ACTIVITY_INFO_SNAPSHOT_]NODE_STARTER\": [\n" + + " {\n" + + " \"assignee\": null,\n" + + " \"assigneeType\": null,\n" + + " \"assignerName\": \"宋爱弟\",\n" + + " \"avatar\": \"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/b048b3d99ef048739a258e48f7feb3dd.jpg\",\n" + + " \"nodeId\": null,\n" + + " \"ouId\": \"6158\",\n" + + " \"personId\": \"9000398967\",\n" + + " \"tenantId\": \"400\"\n" + + " }\n" + + " ],\n" + + " \"[_ACTIVITY_INFO_SNAPSHOT_]node_289121268979\": [\n" + + " {\n" + + " \"assignee\": null,\n" + + " \"assigneeType\": null,\n" + + " \"assignerName\": null,\n" + + " \"avatar\": null,\n" + + " \"nodeId\": null,\n" + + " \"ouId\": \"6158\",\n" + + " \"personId\": \"9000400266\",\n" + + " \"tenantId\": \"398\"\n" + + " }\n" + + " ],\n" + + " \"_TASK_COMPLETE_TYPE202504291615200000081\": \"DELETED\",\n" + + " \"relationArea\": \"\",\n" + + " \"[_SIGNATURE_COLLECTION_]\": [\n" + + " {\n" + + " \"activityId\": \"NODE_STARTER\",\n" + + " \"activityName\": \"发起人\",\n" + + " \"signatures\": []\n" + + " }\n" + + " ],\n" + + " \"visaId\": 904,\n" + + " \"[_INTERNAL_PROCESS_WORKSPACE_TYPE]\": 1,\n" + + " \"initiatorName\": \"宋爱弟\",\n" + + " \"[_CLOSE_PROCESS_ASSIGNER_]\": {\n" + + " \"assignee\": \"2008269\",\n" + + " \"assigneeType\": \"3\",\n" + + " \"assignerName\": \"高志鹏\",\n" + + " \"avatar\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/banner/banner_test/5c441569ee524c208295de72b64863d4.jpg\",\n" + + " \"nodeId\": null,\n" + + " \"ouId\": \"6158\",\n" + + " \"personId\": \"9000400266\",\n" + + " \"tenantId\": \"400\"\n" + + " },\n" + + " \"[_CREATE_INSTANCE_PARAMS]\": \"{\\\"processDefinitionKey\\\":\\\"bgqzyy\\\",\\\"tenantId\\\":\\\"398\\\",\\\"specifyAssignerMap\\\":{\\\"node_289121268979\\\":[{\\\"personId\\\":\\\"9000400266\\\",\\\"tenantId\\\":\\\"398\\\",\\\"ouId\\\":\\\"6158\\\"}]},\\\"variables\\\":{\\\"visaId\\\":904,\\\"stampOuId\\\":6158,\\\"topic\\\":\\\"123123\\\",\\\"initiatorUnitName\\\":\\\"四川星腾贸易有限公司\\\",\\\"stampType\\\":\\\"OFFICIAL\\\",\\\"stampTypeDesc\\\":\\\"公章\\\",\\\"stampRecipient\\\":\\\"yDtB3UUckpxbd98vUxfgmNJ8GHnqu6Sd\\\",\\\"stampContractId\\\":\\\"yDtB3UUckpxbd98wUxfgmNJRzSKgRqTy\\\",\\\"pdfFileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/cms/cms_test/55bc64fb1a3e4185a0bb076fef0267e9.pdf\\\",\\\"initiatorName\\\":\\\"宋爱弟\\\",\\\"visaType\\\":\\\"DESIGN_CHANGE\\\",\\\"visaTypeDesc\\\":\\\"设计变更\\\",\\\"[_INTERNAL_PROCESS_WORKSPACE_TYPE]\\\":1,\\\"[_INTERNAL_PROCESS_BIZ_TYPE]\\\":\\\"approval\\\",\\\"[_INTERNAL_INITIATOR_]\\\":\\\"{\\\\\\\"assignerName\\\\\\\":\\\\\\\"宋爱弟\\\\\\\",\\\\\\\"avatar\\\\\\\":\\\\\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/b048b3d99ef048739a258e48f7feb3dd.jpg\\\\\\\",\\\\\\\"ouId\\\\\\\":\\\\\\\"6158\\\\\\\",\\\\\\\"personId\\\\\\\":\\\\\\\"9000398967\\\\\\\",\\\\\\\"tenantId\\\\\\\":\\\\\\\"400\\\\\\\"}\\\",\\\"[_BIZ_ORG_RELATION_]\\\":{},\\\"[_WORKFLOW_ENGINE_VERSION_]\\\":\\\"1.5.2\\\",\\\"[_PENDING_VARIABLES]\\\":{\\\"visaId\\\":904,\\\"stampOuId\\\":6158,\\\"topic\\\":\\\"123123\\\",\\\"initiatorUnitName\\\":\\\"四川星腾贸易有限公司\\\",\\\"stampType\\\":\\\"OFFICIAL\\\",\\\"stampTypeDesc\\\":\\\"公章\\\",\\\"stampRecipient\\\":\\\"yDtB3UUckpxbd98vUxfgmNJ8GHnqu6Sd\\\",\\\"stampContractId\\\":\\\"yDtB3UUckpxbd98wUxfgmNJRzSKgRqTy\\\",\\\"pdfFileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/cms/cms_test/55bc64fb1a3e4185a0bb076fef0267e9.pdf\\\",\\\"initiatorName\\\":\\\"宋爱弟\\\",\\\"visaType\\\":\\\"DESIGN_CHANGE\\\",\\\"visaTypeDesc\\\":\\\"设计变更\\\"},\\\"[_INTERNAL_PROCESS_AGENT]\\\":false,\\\"[_PROCESS_OWNERSHIP_APPLICATION_]\\\":\\\"nanopart\\\",\\\"[_INITIATOR_SPECIFY_]\\\":{\\\"node_289121268979\\\":[{\\\"personId\\\":\\\"9000400266\\\",\\\"tenantId\\\":\\\"398\\\",\\\"ouId\\\":\\\"6158\\\"}]}},\\\"signVariables\\\":{},\\\"pendingVariables\\\":{\\\"visaId\\\":904,\\\"stampOuId\\\":6158,\\\"topic\\\":\\\"123123\\\",\\\"initiatorUnitName\\\":\\\"四川星腾贸易有限公司\\\",\\\"stampType\\\":\\\"OFFICIAL\\\",\\\"stampTypeDesc\\\":\\\"公章\\\",\\\"stampRecipient\\\":\\\"yDtB3UUckpxbd98vUxfgmNJ8GHnqu6Sd\\\",\\\"stampContractId\\\":\\\"yDtB3UUckpxbd98wUxfgmNJRzSKgRqTy\\\",\\\"pdfFileUrl\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/cms/cms_test/55bc64fb1a3e4185a0bb076fef0267e9.pdf\\\",\\\"initiatorName\\\":\\\"宋爱弟\\\",\\\"visaType\\\":\\\"DESIGN_CHANGE\\\",\\\"visaTypeDesc\\\":\\\"设计变更\\\"},\\\"cooperationOrg\\\":{},\\\"businessKey\\\":\\\"904\\\",\\\"initiator\\\":{\\\"assignerName\\\":\\\"宋爱弟\\\",\\\"personId\\\":\\\"9000398967\\\",\\\"tenantId\\\":\\\"400\\\",\\\"ouId\\\":\\\"6158\\\",\\\"avatar\\\":\\\"https://axzo-app.oss-cn-chengdu.aliyuncs.com/face/face_test/b048b3d99ef048739a258e48f7feb3dd.jpg\\\"},\\\"async\\\":false,\\\"startFormVariables\\\":{\\\"no\\\":\\\"123\\\",\\\"reason\\\":\\\"123\\\",\\\"relationArea\\\":\\\"\\\",\\\"contractNo\\\":\\\"111\\\",\\\"unitPerson\\\":[{\\\"unit\\\":\\\"四川星腾贸易有限公司(总包单位)\\\",\\\"person\\\":\\\"张鹏辉-职员\\\"}],\\\"relationProfessional\\\":\\\"\\\",\\\"topic\\\":\\\"123123\\\",\\\"contextDescription\\\":[],\\\"workspaceName\\\":\\\"test-0925项目2\\\",\\\"contractName\\\":\\\"111\\\",\\\"happenTime\\\":\\\"2025.04.25\\\",\\\"relationProject\\\":\\\"0925工程\\\"}}\",\n" + + " \"visaType\": \"DESIGN_CHANGE\",\n" + + " \"[_WORKFLOW_ENGINE_VERSION_]\": \"1.5.2\",\n" + + " \"[_BIZ_ORG_RELATION_]\": {\n" + + " \"orgScopes\": [],\n" + + " \"workerTeamScopes\": []\n" + + " },\n" + + " \"stampRecipient\": \"yDtB3UUckpxbd98vUxfgmNJ8GHnqu6Sd\",\n" + + " \"stampTypeDesc\": \"公章\",\n" + + " \"relationProfessional\": \"\",\n" + + " \"contextDescription\": [],\n" + + " \"topic\": \"123123\",\n" + + " \"[_PENDING_VARIABLES]\": {\n" + + " \"visaId\": 904,\n" + + " \"stampOuId\": 6158,\n" + + " \"topic\": \"123123\",\n" + + " \"initiatorUnitName\": \"四川星腾贸易有限公司\",\n" + + " \"stampType\": \"OFFICIAL\",\n" + + " \"stampTypeDesc\": \"公章\",\n" + + " \"stampRecipient\": \"yDtB3UUckpxbd98vUxfgmNJ8GHnqu6Sd\",\n" + + " \"stampContractId\": \"yDtB3UUckpxbd98wUxfgmNJRzSKgRqTy\",\n" + + " \"pdfFileUrl\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/cms/cms_test/55bc64fb1a3e4185a0bb076fef0267e9.pdf\",\n" + + " \"initiatorName\": \"宋爱弟\",\n" + + " \"visaType\": \"DESIGN_CHANGE\",\n" + + " \"visaTypeDesc\": \"设计变更\"\n" + + " },\n" + + " \"relationProject\": \"0925工程\"\n" + + " },\n" + + " \"workflowEngineVersion\": \"1.5.2\"\n" + + " }", ProcessInstanceDTO.class); completeVisaChangeStampHandler.onCompleted(dto); } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandler.java index b8cc4223..9ac9873e 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/CompleteVisaChangeStampHandler.java @@ -15,7 +15,6 @@ import cn.axzo.framework.rocketmq.Event; import cn.axzo.framework.rocketmq.EventConsumer; import cn.axzo.nanopart.visa.api.enums.VisaProcessPhase; import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum; -import cn.axzo.nanopart.visa.api.enums.VisaStampStatusEnum; import cn.axzo.nanopart.visa.api.request.UpdateVisaChangeReq; import cn.axzo.nanopart.visa.server.config.RefreshableConfiguration; import cn.axzo.nanopart.visa.server.domain.ChangeRecord; @@ -117,12 +116,6 @@ public class CompleteVisaChangeStampHandler implements ProcessInstanceEventHandl .allMatch(e -> e.getValue().stream() .anyMatch(relation -> Objects.equals(result.getStatus(), relation.getContentExt()))); if (approvedOrRejected) { - // 有可能用户在界面手动完成用印， 这里就无法自动完成 - if (Objects.isNull(changeRecord) || !Objects.equals(phase == VisaProcessPhase.PROJECT ? changeRecord.getStampStatus() : changeRecord.getStampStatusPay(), VisaStampStatusEnum.WITH_PRINT)) { - log.info("CompleteVisaChangeStampHandler changeRecord stampStatus not withPrint"); - return; - } - boolean approved = result == BpmnProcessInstanceResultEnum.APPROVED; changeRecordService.update(UpdateVisaChangeReq.builder() .visaId(visaId)