mg
2022-10-12 a8c48babd4bd3e181b0f0bb1130c4c900edcacc2
优化调度,审核流程
7个文件已修改
1个文件已添加
170 ■■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/common/constant/StepName.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/common/constant/StepName.java
New file
@@ -0,0 +1,26 @@
package com.ycl.common.constant;
public enum StepName {
    DISPATCH("01", "调度"),
    DISPOSE("02", "上传处置结果"),
    CHECK("03", "核查"),
    CLOSING_REGISTER("04", "结案");
    private String code;
    private String name;
    StepName(String code, String name) {
        this.code = code;
        this.name = name;
    }
    public String getCode() {
        return code;
    }
    public String getName() {
        return name;
    }
}
ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
@@ -1,11 +1,13 @@
package com.ycl.controller.caseHandler;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.caseHandler.ChechParam;
import com.ycl.service.caseHandler.ICheckHandleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -30,6 +32,8 @@
    @RequestMapping(value = "/check", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult check(@Validated @RequestBody ChechParam chechParam) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        chechParam.setCurrentUser(user.getUserId());
        return CommonResult.success(iCheckHandleService.check(chechParam));
    }
}
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -52,6 +52,8 @@
    @RequestMapping(value = "/dispatch", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        dispatchInfoParam.setCreateUser(user.getUserId());
        return CommonResult.success(iDispatchHandleService.dispatch(dispatchInfoParam));
    }
ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
@@ -18,7 +18,7 @@
    /**
     * 案件id
     */
    @ApiModelProperty(value = "案件id")
    @ApiModelProperty(value = "案件id", required = true)
    private Long baseCaseId;
    /**
     * 当前处理人
@@ -35,4 +35,10 @@
     */
    @ApiModelProperty(value = "审核意见")
    private String checkOpinion;
    /**
     * 审核结果
     */
    @ApiModelProperty(value = "审核结果")
    private String result;
}
ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
@@ -18,8 +18,9 @@
    /**
     * 案件id
     */
    @ApiModelProperty(value = "案件id")
    @ApiModelProperty(value = "案件id", required = true)
    private Long baseCaseId;
    /**
     * 执法人员
     */
@@ -61,4 +62,10 @@
    @ApiModelProperty(value = "派遣意见")
    private String dispatchOpinion;
    /**
     * 当前登录人
     */
    @ApiModelProperty(value = "派遣意见")
    private Long createUser;
}
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
@@ -85,7 +85,7 @@
     */
    @TableField("handler_id")
    @ApiModelProperty(value = "实际处理人")
    private Integer handlerId;
    private Long handlerId;
    /**
     * 创建人
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java
@@ -1,17 +1,23 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.ChechParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.entity.caseHandler.WorkflowConfigStep;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DisposeRecordMapper;
import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
import com.ycl.service.caseHandler.ICheckHandleService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
/**
 * <p>
@@ -28,21 +34,62 @@
    @Resource
    BaseCaseMapper baseCaseMapper;
    @Resource
    DisposeRecordMapper disposeRecordMapper;
    @Resource
    WorkflowConfigStepMapper workflowConfigStepMapper;
    @Override
    public Boolean check(ChechParam chechParam) {
          //新增流程记录信息
        DisposeRecord disposeRecord = new DisposeRecord();
        disposeRecord.setBaseCaseId(chechParam.getBaseCaseId());
        disposeRecord.setWorkflowConfigStepId(3L);
        disposeRecord.setState(chechParam.getStatus());
        disposeRecord.setCreateUser(chechParam.getCurrentUser());
        disposeRecord.setStepName("核查");
        baseMapper.insert(disposeRecord);
         //修改案件状态为审核
        BaseCase baseCase = new BaseCase();
        baseCase.setId(chechParam.getBaseCaseId());
        baseCase.setState(BaseCaseStatus.CHECK);
        baseCase.setAuditOpinion(chechParam.getCheckOpinion());
        baseCaseMapper.updateById(baseCase);
        QueryWrapper<WorkflowConfigStep> stepqurey = new QueryWrapper<>();
        stepqurey.eq("name", StepName.CHECK.getName());
        WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepqurey);
        if (workflowConfigStep == null) {
            throw new ApiException("未查询到该流程环节");
        }
        //添加调度记录
        DisposeRecord disposeRecord = new DisposeRecord();
        disposeRecord.setBaseCaseId(baseCase.getId());
        disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
        disposeRecord.setStepName(workflowConfigStep.getName());
        disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
        disposeRecord.setHandlerId(chechParam.getCurrentUser());
        disposeRecord.setState(1);
        disposeRecord.setStartTime(LocalDateTime.now());
        disposeRecord.setEndTime(LocalDateTime.now());
        disposeRecord.setResult(chechParam.getResult());
        disposeRecord.setCreateUser(chechParam.getCurrentUser());
        disposeRecord.setCreateTime(LocalDateTime.now());
        disposeRecordMapper.insert(disposeRecord);
        QueryWrapper<WorkflowConfigStep> stepNextqurey = new QueryWrapper<>();
        stepNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
        stepNextqurey.eq("seq", workflowConfigStep.getSeq() + 1);
        WorkflowConfigStep stepNext = workflowConfigStepMapper.selectOne(stepNextqurey);
        //添加下一步记录
        DisposeRecord stepNextRecord = new DisposeRecord();
        stepNextRecord.setBaseCaseId(baseCase.getId());
        stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
        stepNextRecord.setStepName(stepNext.getName());
        stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
        stepNextRecord.setHandlerId(chechParam.getCurrentUser());
        //上传处置未结束
        stepNextRecord.setState(0);
        stepNextRecord.setStartTime(LocalDateTime.now());
        stepNextRecord.setCreateUser(chechParam.getCurrentUser());
        stepNextRecord.setCreateTime(LocalDateTime.now());
        disposeRecordMapper.insert(stepNextRecord);
        return true;
    }
}
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
@@ -1,18 +1,26 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DispatchInfo;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.entity.caseHandler.WorkflowConfigStep;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DispatchInfoMapper;
import com.ycl.mapper.caseHandler.DisposeRecordMapper;
import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
import com.ycl.service.caseHandler.IDispatchHandleService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -29,6 +37,10 @@
    @Resource
    BaseCaseMapper baseCaseMapper;
    @Resource
    DisposeRecordMapper disposeRecordMapper;
    @Resource
    WorkflowConfigStepMapper workflowConfigStepMapper;
    @Override
    public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
        //新增调度信息
@@ -41,6 +53,50 @@
        baseCase.setId(dispatchInfoParam.getBaseCaseId());
        baseCase.setState(BaseCaseStatus.DISPATCH);
        baseCaseMapper.updateById(baseCase);
        QueryWrapper<WorkflowConfigStep> stepqurey = new QueryWrapper<>();
        stepqurey.eq("name", StepName.DISPATCH.getName());
        WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepqurey);
        if (workflowConfigStep == null) {
            throw new ApiException("未查询到该流程环节");
        }
        //添加调度记录
        DisposeRecord disposeRecord = new DisposeRecord();
        disposeRecord.setBaseCaseId(baseCase.getId());
        disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
        disposeRecord.setStepName(workflowConfigStep.getName());
        disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
        disposeRecord.setHandlerId(dispatchInfo.getCreateUser());
        //调度已结束
        disposeRecord.setState(1);
        disposeRecord.setStartTime(LocalDateTime.now());
        disposeRecord.setEndTime(LocalDateTime.now());
        disposeRecord.setCreateUser(dispatchInfo.getCreateUser());
        disposeRecord.setCreateTime(LocalDateTime.now());
        disposeRecordMapper.insert(disposeRecord);
        QueryWrapper<WorkflowConfigStep> stepNextqurey = new QueryWrapper<>();
        stepNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
        stepNextqurey.eq("seq", workflowConfigStep.getSeq() + 1);
        WorkflowConfigStep stepNext = workflowConfigStepMapper.selectOne(stepNextqurey);
        //添加下一步记录
        DisposeRecord stepNextRecord = new DisposeRecord();
        stepNextRecord.setBaseCaseId(baseCase.getId());
        stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
        stepNextRecord.setStepName(stepNext.getName());
        stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
        stepNextRecord.setHandlerId(dispatchInfo.getCreateUser());
        //上传处置未结束
        stepNextRecord.setState(0);
        stepNextRecord.setStartTime(LocalDateTime.now());
        stepNextRecord.setCreateUser(dispatchInfo.getCreateUser());
        stepNextRecord.setCreateTime(LocalDateTime.now());
        disposeRecordMapper.insert(stepNextRecord);
        return dispatchInfo;
    }