修改事务接口

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

@@ -306,13 +306,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         {
             StartUser= sysUserService.getById(LoginContext.getContext().getLoginUser());
         }
+        String a=taskDTO.getProcessId();
         TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString())
+
                 .includeProcessVariables().taskCreatedAfter(taskDTO.getStartTime()).taskCreatedBefore(taskDTO.getEndTime())
                 .orderByTaskCreateTime().desc();
         //条件查询（流程名称，开始时间，结束时间,发物单位，装备名称）
         if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
             taskQuery = taskQuery.processDefinitionNameLike("%"+taskDTO.getProcessDefinitionName()+"%");
         }
+
         //装备名称
         if (ObjectUtil.isNotNull(taskDTO.getTypeName()) && ! taskDTO.getTypeName().trim().isEmpty()){
             taskQuery=taskQuery.processVariableValueLike(INVLIST,"%"+taskDTO.getTypeName()+"%");
@@ -326,7 +329,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         //流程id
         if (ObjectUtil.isNotNull(taskDTO.getProcessId()) && ! taskDTO.getProcessId().trim().isEmpty()){
-            taskQuery=taskQuery.processVariableValueEquals(PROCESS_ID,taskDTO.getProcessId());
+            taskQuery=  taskQuery.processInstanceId(taskDTO.getProcessId());
         }
         //流程状态
         if (!ObjectUtil.isNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("正在处理")){
@@ -339,6 +342,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
         }
 
+        Object aa= taskQuery.list();
 //        taskQuery.
         List<Task> tasks = taskQuery.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize());
         //根据条件查询符合条件的数据并统计数量条数
@@ -364,7 +368,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             taskVO.setStartTime(processInstance.getStartTime());
             taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId()));
-            taskVO.setProcessId(MapUtil.getStr(processVariables,PROCESS_ID));
             taskVO.setBusinessStatus(MapUtil.getStr(processVariables,PROCESS_STATUS));
 
             taskVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME));
@@ -373,7 +376,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskVO.setBusinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
             taskVO.setOutInState(MapUtil.getStr(processVariables,OUT_IN_STATE));
 
-
             taskVO.setTaskCreatedTime(task.getCreateTime());
             DelegationState delegationState = task.getDelegationState();
             if(delegationState!=null){
@@ -448,7 +450,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         //流程id
         if (ObjectUtil.isNotNull(taskDTO.getProcessId()) && ! taskDTO.getProcessId().trim().isEmpty()){
-            historicTaskQuery=historicTaskQuery.processVariableValueEquals(PROCESS_ID,taskDTO.getProcessId());
+            historicTaskQuery=historicTaskQuery.processInstanceId(taskDTO.getProcessId());
         }
         //流程状态
         if (!ObjectUtil.isNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("正在处理")){
@@ -504,7 +506,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskVO.setInvList(MapUtil.getStr(processVariables,INVLIST));
             taskVO.setBusinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
             taskVO.setOutInState(MapUtil.getStr(processVariables,OUT_IN_STATE));
-            taskVO.setProcessId(MapUtil.getStr(processVariables,PROCESS_ID));
             long totalTimes = task.getEndTime() == null ?
                     (Calendar.getInstance().getTimeInMillis() - task.getStartTime().getTime()) :
                     (task.getEndTime().getTime() - task.getStartTime().getTime());
@@ -595,7 +596,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         //流程id
         if (ObjectUtil.isNotNull(applyDTO.getProcessId()) && ! applyDTO.getProcessId().trim().isEmpty()){
-            desc=desc.variableValueEquals(PROCESS_ID,applyDTO.getProcessId());
+            desc=desc.processInstanceId(applyDTO.getProcessId());
         }
         //流程状态
         if (!ObjectUtil.isNull(applyDTO.getBusinessStatus()) && applyDTO.getBusinessStatus().equals("正在处理")){
@@ -639,7 +640,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             historyProcessInstanceVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME));
             historyProcessInstanceVO.setEndOrgName(MapUtil.getStr(processVariables,END_ORG_NAME));
             historyProcessInstanceVO.setInvList(MapUtil.getStr(processVariables,INVLIST));
-            historyProcessInstanceVO.setProcessId(MapUtil.getStr(processVariables,PROCESS_ID));
             historyProcessInstanceVO.setBussinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
             historyProcessInstanceVO.setOutInState(MapUtil.getStr(processVariables,OUT_IN_STATE));
             //表单内容