zhanghua
2022-12-05 66565064a656ffa6dd3d37f7550ddb2316457979
驳回处理和我的待办
5个文件已修改
32 ■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -195,12 +195,11 @@
        stepQuery.eq("name", stepName);
        WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQuery);
        Integer state = 0;
        DisposeRecord disposeRecord = new DisposeRecord();
        disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
        disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
        disposeRecord.setBaseCaseId(id);
        disposeRecord.setState(state);
        disposeRecord.setState(1);
        disposeRecord.setCreateTime(LocalDateTime.now());
        AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        disposeRecord.setCreateUser(userDetails.getUserId());
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java
@@ -58,25 +58,23 @@
        if (CheckResult.REJECT.getName().equals(chechParam.getResult())) {
            QueryWrapper<WorkflowConfigStep> lastNextqurey = new QueryWrapper<>();
            lastNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
            lastNextqurey.eq("seq", workflowConfigStep.getSeq()-1);
            lastNextqurey.eq("seq", workflowConfigStep.getSeq());
            WorkflowConfigStep lastStep = workflowConfigStepMapper.selectOne(lastNextqurey);
            //删除上一步数据
            //删除当前数据
            UpdateWrapper<DisposeRecord> deleteWrapper = new UpdateWrapper<>();
            deleteWrapper.eq("base_case_id", chechParam.getBaseCaseId()).eq("workflow_config_step_id",lastStep.getId());
            disposeRecordMapper.delete(deleteWrapper);
            //修改状态为上上一步状态
            //修改状态为上一步状态
            QueryWrapper<WorkflowConfigStep> lastLastNextqurey = new QueryWrapper<>();
            lastLastNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
            lastLastNextqurey.eq("seq", workflowConfigStep.getSeq()-2);
            lastLastNextqurey.eq("seq", workflowConfigStep.getSeq() - 1);
            WorkflowConfigStep lastLastStep = workflowConfigStepMapper.selectOne(lastLastNextqurey);
            UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
            updateWrapper.eq("base_case_id", chechParam.getBaseCaseId()).eq("workflow_config_step_id",lastLastStep.getId());
            disposeRecord.setHandlerId(chechParam.getCurrentUser());
            //核查已结束
            //处理未开始
            disposeRecord.setState(0);
            disposeRecord.setEndTime(LocalDateTime.now());
            disposeRecordMapper.update(disposeRecord, updateWrapper);
            //调度
            baseCase.setState(BaseCaseStatus.DISPATCH);
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -121,7 +121,7 @@
                                , uploadDisposingResultParam.getWritPic()));
                iImageResourcesService.updateById(imageResources);
            }
            return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
            baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
        } else {
            //当事人
            PartyInfo partyInfo = new PartyInfo();
@@ -177,6 +177,9 @@
            }
            baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
        }
            String stepName = StepName.CHECK.getName();
            DisposeRecord disposeRecord = new DisposeRecord();
            disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId());
@@ -185,7 +188,6 @@
            disposeRecord.setCreateUser(user.getUserId());
            disposeRecord.setStepName(stepName);
            disposeRecord.setStartTime(LocalDateTime.now());
            //结束上传处置流程
            QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
            qureyDispatch.eq("name", StepName.DISPOSE.getName());
@@ -211,6 +213,5 @@
            disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
            disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
            return baseMapper.insert(disposeRecord) == 1 ? true : false;
        }
    }
}
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
@@ -44,6 +44,7 @@
    WorkflowConfigStepMapper workflowConfigStepMapper;
    @Override
    @Transactional
    public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
        //新增调度信息
        DispatchInfo dispatchInfo = new DispatchInfo();
ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml
@@ -24,6 +24,7 @@
    </sql>
    <select id="selectMyBackList" resultType="com.ycl.vo.MyBacklogVO">
        with tmp as(
        SELECT
        t3.event_source,
        t3.category,
@@ -38,7 +39,7 @@
        left JOIN ums_base_case t3 ON t2.base_case_id=t3.id
        <where>
            t1.admin_id = #{id} and t3.`code` is not null
            AND ISNULL( t2.end_time )
            AND t2.state = 0
            <if test="code!='' and code!=null">
                and t3.`code` LIKE CONCAT('%',#{code},'%')
            </if>
@@ -57,12 +58,12 @@
        LEFT JOIN ums_base_case t3 ON t2.base_case_id = t3.id
        <where>
            t2.handler_id = #{id}
            AND ISNULL(
            t2.end_time
            )
            AND t2.state = 0
            <if test="code!='' and code!=null">
                and t3.`code` LIKE CONCAT('%',#{code},'%')
            </if>
        </where>
        )
        select distinct * from tmp order by create_time
    </select>
</mapper>