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

mg

2022-10-12 3f9ebf19e687c33287b0eaec64d4564a212f57db

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.util.UtilNumber;
import com.ycl.controller.BaseController;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
@@ -27,7 +28,6 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.UUID;


/**
@@ -53,6 +53,9 @@

    @Autowired
    IDisposeRecordService iDisposeRecordService;

    @Autowired
    UtilNumber utilNumber;


    @Autowired
@@ -169,7 +172,7 @@
        BeanUtils.copyProperties(violationParam, baseCase);
        baseCase.setEventSource(resource);
        baseCase.setCategory(violation);
        baseCase.setCode(UUID.randomUUID().toString());
        baseCase.setCode(utilNumber.createCaseCode());
        baseCase.setState(BaseCaseStatus.PENDING);
        baseCaseService.save(baseCase);
        return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
@@ -189,7 +192,7 @@
        BeanUtils.copyProperties(illegalBuildingParam, baseCase);
        baseCase.setCategory(illegalBuilding);
        baseCase.setEventSource(resource);
        baseCase.setCode(UUID.randomUUID().toString());
        baseCase.setCode(utilNumber.createCaseCode());
        baseCase.setState(BaseCaseStatus.PENDING);
        baseCaseService.save(baseCase);
        return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
@@ -238,7 +241,7 @@
    @ApiOperation(value = "暂不处置重新处置")
    @PutMapping("/reset")
    public CommonResult resetCase(@RequestParam Integer caseId) {
        Integer firstNum = 0;
        Integer firstNum = 1;
        Integer state = iDisposeRecordService
                .list(new LambdaQueryWrapper<DisposeRecord>()
                        .eq(DisposeRecord::getBaseCaseId, caseId).
@@ -255,4 +258,6 @@
        baseCaseService.endCase(caseId, result);
        return CommonResult.success("end case success~!");
    }


}