diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 38e331a..3910e78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -167,6 +167,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         String formId = request.getFormId();
@@ -377,7 +378,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 38e331a..3910e78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -167,6 +167,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         String formId = request.getFormId();
@@ -377,7 +378,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 0ef09a3..426daee 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -349,6 +349,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         String formId = request.getFormId();
         // 发起流程

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 38e331a..3910e78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -167,6 +167,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         String formId = request.getFormId();
@@ -377,7 +378,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 0ef09a3..426daee 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -349,6 +349,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         String formId = request.getFormId();
         // 发起流程
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 87f807b..f6df473 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -274,6 +274,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         ReturnDTO returnDTO = baseApprovalService.processSubmit(request.getFormId(), request.getId());

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 38e331a..3910e78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -167,6 +167,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         String formId = request.getFormId();
@@ -377,7 +378,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 0ef09a3..426daee 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -349,6 +349,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         String formId = request.getFormId();
         // 发起流程
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 87f807b..f6df473 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -274,6 +274,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         ReturnDTO returnDTO = baseApprovalService.processSubmit(request.getFormId(), request.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index 47c5adc..ec7d148 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -238,7 +238,7 @@
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
                 .endOr()
                 .singleResult();
         if (Objects.isNull(historicProcessInstance)) {
@@ -248,7 +248,7 @@
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
-        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
+//        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
         return ReturnUtil.success();
     }
 
@@ -265,7 +265,7 @@
 
         Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
-        // TODO: 2022/12/29 需联调测试删除后查询时的deleted
+        runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.DELETED);
         runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "删除");
 
         return ReturnUtil.success();

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 38e331a..3910e78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -167,6 +167,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         String formId = request.getFormId();
@@ -377,7 +378,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 0ef09a3..426daee 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -349,6 +349,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         String formId = request.getFormId();
         // 发起流程
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 87f807b..f6df473 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -274,6 +274,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         ReturnDTO returnDTO = baseApprovalService.processSubmit(request.getFormId(), request.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index 47c5adc..ec7d148 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -238,7 +238,7 @@
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
                 .endOr()
                 .singleResult();
         if (Objects.isNull(historicProcessInstance)) {
@@ -248,7 +248,7 @@
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
-        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
+//        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
         return ReturnUtil.success();
     }
 
@@ -265,7 +265,7 @@
 
         Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
-        // TODO: 2022/12/29 需联调测试删除后查询时的deleted
+        runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.DELETED);
         runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "删除");
 
         return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 95e0c70..3b0bdd7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -118,6 +118,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         //2.根据流程定义id启动流程实例
@@ -291,7 +292,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 38e331a..3910e78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -167,6 +167,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         String formId = request.getFormId();
@@ -377,7 +378,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 0ef09a3..426daee 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -349,6 +349,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         String formId = request.getFormId();
         // 发起流程
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 87f807b..f6df473 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -274,6 +274,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         ReturnDTO returnDTO = baseApprovalService.processSubmit(request.getFormId(), request.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index 47c5adc..ec7d148 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -238,7 +238,7 @@
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
                 .endOr()
                 .singleResult();
         if (Objects.isNull(historicProcessInstance)) {
@@ -248,7 +248,7 @@
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
-        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
+//        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
         return ReturnUtil.success();
     }
 
@@ -265,7 +265,7 @@
 
         Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
-        // TODO: 2022/12/29 需联调测试删除后查询时的deleted
+        runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.DELETED);
         runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "删除");
 
         return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 95e0c70..3b0bdd7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -118,6 +118,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         //2.根据流程定义id启动流程实例
@@ -291,7 +292,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
index 150b754..1b3f8d1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
@@ -14,10 +14,10 @@
 import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
 import com.casic.missiles.dto.meter.*;
-import com.casic.missiles.enums.PrefixCodeEnum;
-import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper;
 import com.casic.missiles.model.meter.MeterTraceSupplier;
@@ -194,6 +194,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         //2.根据流程定义id启动流程实例
@@ -322,7 +323,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 0e94b9e..576aef1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -85,7 +85,7 @@
         ProcessInstance processInstance = processInstanceBuilder
                 .processDefinitionId(processDefinition.getId()) //只能通过id启动，key启动不生效
                 .variables(processVariables)//启动流程时设置的全局变量，整个流程实例生效
-//                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
+                .businessStatus(ApprovalStatusEnum.IN_APPROVED)//设置自定义的业务状态
                 .businessKey(String.valueOf(id))//关联业务表主键
                 .start();
 
@@ -133,7 +133,7 @@
                     .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.FAILED) //不加deleted查询的是所有的
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -360,10 +360,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId()) //这里使用流程定义，因为更新流程定义不会更新定义id，会更新部署id
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -375,10 +375,10 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .or()
-                .unfinished()
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
-                .endOr()
+//                .or()
+//                .unfinished()
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
+//                .endOr()
                 .startedBy(String.valueOf(user.getId()))
                 .orderByProcessInstanceStartTime().desc()
                 .list();
@@ -405,7 +405,7 @@
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
 //                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //todo:拒绝按钮已增加业务状态，需验证不加deleted查询的是未删除的还是所有的
+                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -459,7 +459,7 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
+//                .deleted() //取消的要执行删除操作，也要设置业务状态，此处可同时设置为条件进行查询
                 .processInstanceBusinessStatus(ApprovalStatusEnum.CANCELED) //对应取消按钮中设置的业务状态
                 .orderByProcessInstanceStartTime().desc()
                 .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index 8e6a9be..4211dfd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -132,6 +132,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         String formId = request.getFormId();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 38e331a..3910e78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -167,6 +167,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         String formId = request.getFormId();
@@ -377,7 +378,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index 0ef09a3..426daee 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -349,6 +349,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         String formId = request.getFormId();
         // 发起流程
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 87f807b..f6df473 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -274,6 +274,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
 
         ReturnDTO returnDTO = baseApprovalService.processSubmit(request.getFormId(), request.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index 47c5adc..ec7d148 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -238,7 +238,7 @@
                 .startedBy(String.valueOf(user.getId()))
                 .or()
                 .unfinished() //审批中的流程才能撤回
-                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回后的编辑操作中设置为该状态
+                .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态
                 .endOr()
                 .singleResult();
         if (Objects.isNull(historicProcessInstance)) {
@@ -248,7 +248,7 @@
 
         //设置取消状态
         runtimeService.updateBusinessStatus(request.getProcessInstanceId(), ApprovalStatusEnum.CANCELED);
-        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
+//        runtimeService.deleteProcessInstance(request.getProcessInstanceId(), "取消");
         return ReturnUtil.success();
     }
 
@@ -265,7 +265,7 @@
 
         Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
 
-        // TODO: 2022/12/29 需联调测试删除后查询时的deleted
+        runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.DELETED);
         runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "删除");
 
         return ReturnUtil.success();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 95e0c70..3b0bdd7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -118,6 +118,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         //2.根据流程定义id启动流程实例
@@ -291,7 +292,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
index 150b754..1b3f8d1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
@@ -14,10 +14,10 @@
 import com.casic.missiles.dto.flowable.ApprovalDeleteRequest;
 import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
 import com.casic.missiles.dto.meter.*;
-import com.casic.missiles.enums.PrefixCodeEnum;
-import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterTraceSupplierMapper;
 import com.casic.missiles.model.meter.MeterTraceSupplier;
@@ -194,6 +194,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         //2.根据流程定义id启动流程实例
@@ -322,7 +323,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if (!CollectionUtils.isEmpty(businessKeys)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
index 47d1df5..dd0566e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
@@ -207,6 +207,7 @@
         //已取消后的提交需先删除原有实例
         if (StringUtils.isNotEmpty(request.getProcessId())){
             runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED);
+            runtimeService.deleteProcessInstance(request.getProcessId(), "删除");
         }
         //1.根据表单id获取流程定义id
         //2.根据流程定义id启动流程实例
@@ -352,7 +353,7 @@
                 //合并未通过-拒绝和未通过-驳回
                 approvalList.addAll(rejectApprovalList);
                 break;
-            //已取消（直接删除实例），该状态维护在flowable
+            //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
                 businessKeys = baseApprovalService.getCanceledList(request.getFormId());
                 if(!CollectionUtils.isEmpty(businessKeys)){