Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-19 c2be8b6fd026bd93c09891febedc1cc06e5bed7e

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

 ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java

@@ -28,6 +28,12 @@
    private String alarmTime;

    /**
     * 调度时限
     */
    @TableField("limit_time")
    private String limitTime;

    /**
     * 所属社区
     */
    @ApiModelProperty(value = "所属社区")

 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java

@@ -27,6 +27,12 @@
    private String alarmTime;

    /**
     * 调度时限
     */
    @TableField("limit_time")
    private String limitTime;

    /**
     * 小类
     */
    @ApiModelProperty(value = "小类")

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -36,6 +36,7 @@
import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -210,11 +211,11 @@
        BeanUtils.copyProperties(violationParam, violations);
        Integer value = 1;
        violations.setId(id);
        setDisposeRecord(id);
        setDisposeRecord(id, violationParam.getLimitTime());
        return violationsMapper.insert(violations) == value ? true : false;
    }

    private void setDisposeRecord(Long id) {
    private void setDisposeRecord(Long id, String limitTime) {
        String stepName = StepName.DISPATCH.getName();
        QueryWrapper<WorkflowConfigStep> stepQuery = new QueryWrapper<>();
        stepQuery.eq("name", stepName);
@@ -231,6 +232,7 @@
        disposeRecord.setCreateUser(userDetails.getUserId());
        disposeRecord.setStartTime(LocalDateTime.now());
        disposeRecord.setStepName(stepName);
        disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        disposeRecordMapper.insert(disposeRecord);
    }

@@ -238,7 +240,7 @@
    public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
        IllegalBuilding illegalBuilding = new IllegalBuilding();
        BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
        setDisposeRecord(id);
        setDisposeRecord(id, illegalBuildingParam.getLimitTime());
        Integer value = 1;
        illegalBuilding.setBaseCaseId(id);
        return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
@@ -266,7 +268,7 @@
        }
        //获取调度信息
        Map mapD = new HashMap();
        mapD.put("baseCaseId",baseCase.getId());
        mapD.put("baseCaseId", baseCase.getId());
        DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD);
        baseCase.setDispatchInfo(dispatchInfo);
        bcd.setBaseCase(baseCase);
@@ -367,7 +369,7 @@
    }

    @Override
    public void endCase(Long caseId, String result,String opinion) {
    public void endCase(Long caseId, String result, String opinion) {
        //获取当前登陆用户信息
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        String endCaseName = StepName.CLOSING_REGISTER.getName();
@@ -384,7 +386,7 @@
            throw new ApiException("未查询到该流程环节");
        }
        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 disposeRecord = new DisposeRecord();

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java

@@ -22,11 +22,12 @@

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;

/**
 * <p>
 *  调度处理 服务实现类
 * 调度处理 服务实现类
 * </p>
 *
 * @author mg
@@ -42,6 +43,7 @@
    DisposeRecordMapper disposeRecordMapper;
    @Resource
    WorkflowConfigStepMapper workflowConfigStepMapper;

    @Override
    public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
        //新增调度信息
@@ -64,7 +66,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 disposeRecord = new DisposeRecord();
@@ -85,6 +87,7 @@
        stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
        stepNextRecord.setStepName(stepNext.getName());
        stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
        stepNextRecord.setLimitTime(LocalDateTime.parse(dispatchInfoParam.getDisposeDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss")));
        //上传处置未结束
        stepNextRecord.setState(0);
        stepNextRecord.setStartTime(LocalDateTime.now());