From 66565064a656ffa6dd3d37f7550ddb2316457979 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 05 十二月 2022 16:52:25 +0800 Subject: [PATCH] 驳回处理和我的待办 --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java | 1 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java | 20 ++++----- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 67 +++++++++++++++++---------------- ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml | 9 ++-- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 3 - 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index f9b019a..a6cfbb2 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/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()); diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java index 1ea1d9a..3b898cc 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java @@ -54,29 +54,27 @@ baseCase.setAuditOpinion(chechParam.getCheckOpinion()); //淇敼鏍告煡璁板綍 DisposeRecord disposeRecord = new DisposeRecord(); - //椹冲洖澶勭悊 + //椹冲洖澶勭悊 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()); + 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()); + 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); @@ -93,7 +91,7 @@ } UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id",workflowConfigStep.getId()); + updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id", workflowConfigStep.getId()); disposeRecord.setHandlerId(chechParam.getCurrentUser()); //鏍告煡宸茬粨鏉� diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java index 50bc0cc..dd769b8 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java +++ b/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,40 +177,41 @@ } 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()); - disposeRecord.setState(0); - disposeRecord.setCreateTime(LocalDateTime.now()); - disposeRecord.setCreateUser(user.getUserId()); - disposeRecord.setStepName(stepName); - disposeRecord.setStartTime(LocalDateTime.now()); - //缁撴潫涓婁紶澶勭疆娴佺▼ - QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>(); - qureyDispatch.eq("name", StepName.DISPOSE.getName()); - WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch); - UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId()); - - DisposeRecord updateRecord = new DisposeRecord(); - updateRecord.setState(1); - updateRecord.setEndTime(LocalDateTime.now()); - updateRecord.setHandlerId(disposeRecord.getCreateUser()); - updateRecord.setResult(uploadDisposingResultParam.getDescription()); - baseMapper.update(updateRecord, updateWrapper); - - QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>(); - stepQurey.eq("name", disposeRecord.getStepName()); - WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey); - if (workflowConfigStep == null) { - throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�"); - } - //璁剧疆娴佺▼鐜妭鏁版嵁 - disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId()); - disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId()); - return baseMapper.insert(disposeRecord) == 1 ? true : false; } + String stepName = StepName.CHECK.getName(); + DisposeRecord disposeRecord = new DisposeRecord(); + disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId()); + disposeRecord.setState(0); + disposeRecord.setCreateTime(LocalDateTime.now()); + disposeRecord.setCreateUser(user.getUserId()); + disposeRecord.setStepName(stepName); + disposeRecord.setStartTime(LocalDateTime.now()); + //缁撴潫涓婁紶澶勭疆娴佺▼ + QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>(); + qureyDispatch.eq("name", StepName.DISPOSE.getName()); + WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch); + + UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId()); + + DisposeRecord updateRecord = new DisposeRecord(); + updateRecord.setState(1); + updateRecord.setEndTime(LocalDateTime.now()); + updateRecord.setHandlerId(disposeRecord.getCreateUser()); + updateRecord.setResult(uploadDisposingResultParam.getDescription()); + baseMapper.update(updateRecord, updateWrapper); + + QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>(); + stepQurey.eq("name", disposeRecord.getStepName()); + WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey); + if (workflowConfigStep == null) { + throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�"); + } + //璁剧疆娴佺▼鐜妭鏁版嵁 + disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId()); + disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId()); + return baseMapper.insert(disposeRecord) == 1 ? true : false; } } diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java index e6a650f..90dffc6 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java +++ b/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(); diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml index d4c54ff..d623161 100644 --- a/ycl-platform/src/main/resources/mapper/caseHandler/DisposeRecordMapper.xml +++ b/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> -- Gitblit v1.8.0