删除无用注释代码

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -525,7 +525,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         List<Task> taskList = taskQuery.listPage(p, pageSize);
         List<FlowTaskDto> flowList = new ArrayList<>();
         for (Task task : taskList) {
-
             FlowTaskDto flowTask = new FlowTaskDto();
             Map<String, Object> processVariables = task.getProcessVariables();
             flowTask.setProcessVariables(processVariables);
@@ -579,13 +578,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName());
             flowTask.setAssigneeSid(sysUserVoResultBean2.getData().getSid());
             flowTask.setDeptName(sysUserVoResultBean2.getData().getOrganizationName());
-
-            // 设置手机端参数
-//            Map<String, Map<String, Object>> variablesMap = getAppOrPcVariables(flowTask);
-//            flowTask.setAppVariables(variablesMap.get("appVariables"));
-//            // 设置pc端参数
-//            flowTask.setPcVariables(variablesMap.get("pcVariables"));
-
             flowList.add(flowTask);
         }
         page.setRecords(flowList);
@@ -695,13 +687,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
      * @return
      */
     public ResultBean<Page<FlowTaskDto>> businessFinishedList(String userSid, List<BusinessTaskParam> params, Integer pageNum, Integer pageSize) {
-
         Page<FlowTaskDto> page = new Page<>();
         Map<String, Object> paraMap = new HashMap<>();
         List<Map<String, Object>> ll = new ArrayList<>();
         for (BusinessTaskParam btq : params) {
             paraMap.put(btq.getField(), btq.getValue());
-
             Map<String, Object> mapss = new HashMap<>();
             if (btq.getSqlOperationSymbol().equals(SQLOperationSymbol.EQUAL)) {
                 mapss.put("symbol", "=");
@@ -713,22 +703,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 mapss.put("value", "%" + btq.getValue() + "%");
                 mapss.put("filed", btq.getField());
             }
-           /* if(btq.getSqlOperationSymbol().equals(SQLOperationSymbol.NONE)){
-                if("processDefinitionId".equals(btq.getField())){
-                    taskInstanceQuery.processDefinitionId(btq.getValue());
-                }
-            }*/
             ll.add(mapss);
         }
-
         paraMap.put("userSid", userSid);
         paraMap.put("list", ll);
         paraMap.put("page", (pageNum - 1) * pageSize);
         paraMap.put("size", pageSize);
-        // List<Map<String, Object>> maps = baseMapper.finishedList(userSid, ll ,(pageNum-1)*pageSize,pageSize);
         List<Map<String, Object>> maps = baseMapper.finishedList1(paraMap);
         int count = baseMapper.finishedListCount(paraMap);
-
         List<FlowTaskDto> hisTaskList = new ArrayList();
         for (Map<String, Object> histTask : maps) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -751,47 +733,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 userName_str=userName.substring(0,userName.length()-1);
                 flowTask.setAssigneeName(userName_str);
             }
-
             flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
             flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
             flowTask.setTaskDefKey(histTask.get("taskDefKey") == null ? "" : histTask.get("taskDefKey").toString());
             flowTask.setTaskName(histTask.get("NAME_") == null ? "" : histTask.get("NAME_").toString());
-            // 判断是否办结
-            /*Object end_act_id_ = histTask.get("END_ACT_ID_");
-            if (end_act_id_ != null) {
-                flowTask.setTaskName(ProcessStateEnum.FINISHED.getStateName());
-            }*/
-
-            // 流程定义信息
-//            ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
-//                    .processDefinitionId(histTask.get("PROC_DEF_ID_").toString())
-//                    .singleResult();
             flowTask.setDeployId(histTask.get("DEPLOYMENT_ID_") == null ? "" : histTask.get("DEPLOYMENT_ID_").toString());
             flowTask.setProcDefName(histTask.get("PROC_DEF_NAME_") == null ? "" : histTask.get("PROC_DEF_NAME_").toString());
             flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
             flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
             flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
-
-            // 流程发起人信息
-//            HistoricProcessInstance hi = historyService.createHistoricProcessInstanceQuery()
-//                    .processInstanceId(histTask.get("PROC_INST_ID_").toString())
-//                    .singleResult();
             ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString());
             flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
             flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
-          //  ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(historicProcessInstance.getStartUserId());
             if(sysUserVoResultBean.getData()!=null){
                 flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
                 flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
-                /*ResultBean<String> pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(sysUserVoResultBean.getData().getSid());
-                String ogrName="";
-                if(pathSidByUserSid.getData()!=null){
-                    ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(pathSidByUserSid.getData());
-                    ogrName=sysOrganizationVoResultBean.getData().getName();
-                }
-                flowTask.setStartDeptName(ogrName+"-"+sysUserVoResultBean.getData().getOrganizationName());*/
             }
-          //  flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
             HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().taskId(flowTask.getTaskId()).singleResult();
             flowTask.setProcessVariables(historicTaskInstance.getProcessVariables());
             Object end_act_id = histTask.get("end_act_id_");