屏蔽了盘点业务

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -355,6 +355,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
                 .includeProcessVariables().taskCreatedAfter(taskDTO.getStartTime()).taskCreatedBefore(taskDTO.getEndTime())
                 .orderByTaskCreateTime().desc();
+
+
         //条件查询（流程名称，开始时间，结束时间,发物单位，装备名称）
         if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
             taskQuery = taskQuery.processDefinitionNameLike("%"+taskDTO.getProcessDefinitionName()+"%");
@@ -474,6 +476,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .includeCaseVariables().includeProcessVariables().includeTaskLocalVariables().includeIdentityLinks()
                 .orderByTaskCreateTime().desc();
 
+        historicTaskQuery = historicTaskQuery.processVariableValueNotEquals(ORDER_TYPE,"stocktakeOrder");
         //根据条件查询（流程名称，开始时间，结束时间）
         if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
             historicTaskQuery = historicTaskQuery.processDefinitionNameLike("%"+taskDTO.getProcessDefinitionName()+"%");
@@ -609,6 +612,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .includeProcessVariables()
                 .startedBy(StartUser.getUserId().toString())
                 .orderByProcessInstanceStartTime().desc();
+
         //根据条件查询（流程名称，开始时间，结束时间）
         if (ObjectUtil.isNotNull(applyDTO.getProcessDefinitionName()) && ! applyDTO.getProcessDefinitionName().trim().isEmpty()){
             List<ProcessDefinition> processDefinitions = repositoryService.createProcessDefinitionQuery()
@@ -627,6 +631,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (ObjectUtil.isNotNull(applyDTO.getEndTime())) {
             desc = desc.startedBefore(applyDTO.getEndTime());
         }
+        desc = desc.variableValueNotEquals(ORDER_TYPE,"stocktakeOrder");
         //装备名称
         if (ObjectUtil.isNotNull(applyDTO.getTypeName()) && ! applyDTO.getTypeName().trim().isEmpty()){
             desc=desc.variableValueLike(INVLIST,"%"+applyDTO.getTypeName()+"%");