我的审批接口调整

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -1649,51 +1649,52 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         SaSession tokenSession = StpUtil.getTokenSession();
         User user = tokenSession.get(GlobalConstant.LOGIN_USER_INFO_KEY, new User());
         List<String> taskIds = new ArrayList<>();
-        if(dto.getStatus() != null && dto.getStatus() == 1){
-            List<WorkflowApproveRecord> list = approveRecordService.list(
-                new QueryWrapper<WorkflowApproveRecord>().lambda()
-                .eq(WorkflowApproveRecord::getApproveUserId, user.getId())
-            );
-            taskIds = list.stream().map(WorkflowApproveRecord::getTaskId).collect(Collectors.toList());
-        }else if(dto.getStatus() != null && dto.getStatus() == 0){
-            TaskQuery taskQuery = taskService.createTaskQuery()
-                    .active()
-                    .taskVariableValueEquals(WorkflowConstant.TASK_IS_APPOINT_APPROVE, YesOrNoEnum.NO.getCode())
-                    .processVariableValueEquals(WorkflowConstant.PROCESS_ISRECYCLE_FLAG_KEY, WorkflowIsRecycleType.NO.getCode())
-                    .taskVariableValueLike(WorkflowConstant.TASK_ASSIGNEE_VAR_KEY, StringPool.PERCENT + user.getId() + StringPool.PERCENT);
-            //
-            if (dto.getStartTime() != null) {
-                taskQuery.taskCreatedAfter(WorkFlowUtil.getStartOfDay(dto.getStartTime()));
-            }
-            if (dto.getEndTime() != null) {
-                taskQuery.taskCreatedBefore(WorkFlowUtil.getEndOfDay(dto.getEndTime()));
-            }
-
-            if (StrUtil.isNotBlank(dto.getKeyword())) {
-                taskQuery.or()
-                        .processVariableValueLike(WorkflowConstant.PROCESS_NAME, StringPool.PERCENT + dto.getKeyword() + StringPool.PERCENT)
-                        .endOr();
-            } else {
-                if (StrUtil.isNotBlank(dto.getSerialNumber()) && StrUtil.isNumeric(dto.getSerialNumber())) {//数字类型，直接查询
-                    taskQuery.processVariableValueEquals(WorkflowConstant.PROCESS_SERIAL_NUMBER_KEY, Long.valueOf(dto.getSerialNumber()));
-                }
-                if (StrUtil.isNotBlank(dto.getName())) {
-                    taskQuery.processVariableValueLike(WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, StringPool.PERCENT + dto.getName() + StringPool.PERCENT);
-                }
-                if (StrUtil.isNotBlank(dto.getOriginator())) {
-                    taskQuery.or()
-                            .processVariableValueEquals(WorkflowConstant.PROCESS_START_USER_NAME_KEY, dto.getOriginator())
-                            .processVariableValueEquals(WorkflowConstant.PROCESS_START_USER_ID_KEY, dto.getOriginator())
-                            .endOr();
-                }
-                if (StrUtil.isNotBlank(dto.getTaskName())) {
-                    taskQuery.taskNameLike(StringPool.PERCENT + dto.getTaskName() + StringPool.PERCENT);
-                }
-            }
-
-            List<Task> tasks = taskQuery.orderByTaskCreateTime().desc().listPage(Convert.toInt((dto.getLimit() - 1) * dto.getSize()), dto.getSize());
-            taskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
-        }
+        List<WorkflowApproveRecord> list = approveRecordService.list(
+            new QueryWrapper<WorkflowApproveRecord>().lambda()
+            .eq(WorkflowApproveRecord::getApproveUserId, user.getId())
+        );
+        taskIds = list.stream().map(WorkflowApproveRecord::getTaskId).collect(Collectors.toList());
+//        if(dto.getStatus() != null && dto.getStatus() == 1){
+//
+//        }else if(dto.getStatus() != null && dto.getStatus() == 0){
+//            TaskQuery taskQuery = taskService.createTaskQuery()
+//                    .active()
+//                    .taskVariableValueEquals(WorkflowConstant.TASK_IS_APPOINT_APPROVE, YesOrNoEnum.NO.getCode())
+//                    .processVariableValueEquals(WorkflowConstant.PROCESS_ISRECYCLE_FLAG_KEY, WorkflowIsRecycleType.NO.getCode())
+//                    .taskVariableValueLike(WorkflowConstant.TASK_ASSIGNEE_VAR_KEY, StringPool.PERCENT + user.getId() + StringPool.PERCENT);
+//            //
+//            if (dto.getStartTime() != null) {
+//                taskQuery.taskCreatedAfter(WorkFlowUtil.getStartOfDay(dto.getStartTime()));
+//            }
+//            if (dto.getEndTime() != null) {
+//                taskQuery.taskCreatedBefore(WorkFlowUtil.getEndOfDay(dto.getEndTime()));
+//            }
+//
+//            if (StrUtil.isNotBlank(dto.getKeyword())) {
+//                taskQuery.or()
+//                        .processVariableValueLike(WorkflowConstant.PROCESS_NAME, StringPool.PERCENT + dto.getKeyword() + StringPool.PERCENT)
+//                        .endOr();
+//            } else {
+//                if (StrUtil.isNotBlank(dto.getSerialNumber()) && StrUtil.isNumeric(dto.getSerialNumber())) {//数字类型，直接查询
+//                    taskQuery.processVariableValueEquals(WorkflowConstant.PROCESS_SERIAL_NUMBER_KEY, Long.valueOf(dto.getSerialNumber()));
+//                }
+//                if (StrUtil.isNotBlank(dto.getName())) {
+//                    taskQuery.processVariableValueLike(WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, StringPool.PERCENT + dto.getName() + StringPool.PERCENT);
+//                }
+//                if (StrUtil.isNotBlank(dto.getOriginator())) {
+//                    taskQuery.or()
+//                            .processVariableValueEquals(WorkflowConstant.PROCESS_START_USER_NAME_KEY, dto.getOriginator())
+//                            .processVariableValueEquals(WorkflowConstant.PROCESS_START_USER_ID_KEY, dto.getOriginator())
+//                            .endOr();
+//                }
+//                if (StrUtil.isNotBlank(dto.getTaskName())) {
+//                    taskQuery.taskNameLike(StringPool.PERCENT + dto.getTaskName() + StringPool.PERCENT);
+//                }
+//            }
+//
+//            List<Task> tasks = taskQuery.orderByTaskCreateTime().desc().listPage(Convert.toInt((dto.getLimit() - 1) * dto.getSize()), dto.getSize());
+//            taskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
+//        }
         dto.setTaskIds(taskIds);
         return xjrWorkflowExtraMapper.myApproveRecord(page, dto);
     }

src/main/resources/mapper/workflow/WorkflowExtraMapper.xml

@@ -3,45 +3,16 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.workflow.mapper.XjrWorkflowExtraMapper">
-    <select id="myApproveRecord" parameterType="com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto" resultType="com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo">
-        select t1.id,t2.name as org_name,t3.name as user_name,t1.shen_qing_ri_qi4752,t1.folder_id,t1.number,t1.total_amount from wf_subscription t1
-        left join xjr_department t2 on t1.application_department = t2.id
-        left join xjr_user t3 on t1.user_id = t3.id
-        where 1 = 1
-        <if test="dto.orgId != null">
-            and t1.id = #{dto.orgId}
+    <select id="myApproveRecord" parameterType="com.xjrsoft.module.workflow.dto.MyExaminePageDto" resultType="com.xjrsoft.module.workflow.vo.PendingTaskVo">
+        SELECT id, serial_number, process_name, task_id, task_name, task_key, current_progress, schema_id, schema_name, process_id,
+        start_user_id, start_user_name, start_time, end_time, launch_time, approve_user_ids FROM xjr_workflow_extra
+        WHERE 1 = 1
+        <if test="dto.taskIds != null and dto.taskIds.size() > 0">
+            and task_id in
+            <foreach item="taskId" index="index" collection="dto.taskIds" open="(" close=")" separator=",">
+                #{taskId}
+            </foreach>
         </if>
-        <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
-            and t1.shen_qing_ri_qi4752 between #{dto.startDate} and #{dto.endDate}
-        </if>
-        <if test="dto.userName != null and dto.userName != ''">
-            and t3.name like concat('%', #{dto.userName}, '%')
-        </if>
-        order by t1.shen_qing_ri_qi4752 desc
-    </select>
-
-    <select id="getList" parameterType="com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto" resultType="com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo">
-        select t1.id,t2.name as org_name,t3.name as user_name,t1.shen_qing_ri_qi4752, t1.folder_id,t1.number,t1.total_amount from wf_subscription t1
-        left join xjr_department t2 on t1.application_department = t2.id
-        left join xjr_user t3 on t1.user_id = t3.id
-        where 1 = 1
-        <if test="dto.orgId != null">
-            and t1.id = #{dto.orgId}
-        </if>
-        <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
-            and t1.shen_qing_ri_qi4752 between #{dto.startDate} and #{dto.endDate}
-        </if>
-        <if test="dto.userName != null and dto.userName != ''">
-            and t3.name like concat('%', #{dto.userName}, '%')
-        </if>
-        order by t1.shen_qing_ri_qi4752 desc
-    </select>
-
-    <select id="getInfoById" resultType="com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo">
-        select t1.id,t2.name as org_name,t3.name as user_name,t1.shen_qing_ri_qi4752,t1.folder_id from wf_subscription t1
-        left join xjr_department t2 on t1.application_department = t2.id
-        left join xjr_user t3 on t1.user_id = t3.id
-        where t1.id = #{id}
     </select>
 
 </mapper>