ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonResult; import com.ycl.common.constant.BaseCaseStatus; import com.ycl.controller.BaseController; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; @@ -164,13 +165,12 @@ public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) { Integer violation = 1; Integer resource = 2; Integer state = 7; BaseCase baseCase = new BaseCase(); BeanUtils.copyProperties(violationParam, baseCase); baseCase.setEventSource(resource); baseCase.setCategory(violation); baseCase.setCode(UUID.randomUUID().toString()); baseCase.setState(state); baseCase.setState(BaseCaseStatus.PENDING); baseCaseService.save(baseCase); return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId())); } @@ -185,13 +185,12 @@ public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) { Integer illegalBuilding = 2; Integer resource = 2; Integer state = 7; BaseCase baseCase = new BaseCase(); BeanUtils.copyProperties(illegalBuildingParam, baseCase); baseCase.setCategory(illegalBuilding); baseCase.setEventSource(resource); baseCase.setCode(UUID.randomUUID().toString()); baseCase.setState(state); baseCase.setState(BaseCaseStatus.PENDING); baseCaseService.save(baseCase); return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId())); } @@ -222,7 +221,7 @@ @ApiOperation(value = "案件状态修改") @PutMapping("/case_status_update") @ApiImplicitParams({ @ApiImplicitParam(value = "处理状态(0误报 1上报 2立案 3派遣 4处置 5核查 6结案7处理中8暂不处理)", name = "state") @ApiImplicitParam(value = "处理状态(0-待处理1-误报2-上报3-再学习/再训练4暂不处理5立案6调度7处置8核查9结案)", name = "state") }) public CommonResult updateCaseStatus(@RequestParam Integer caseId, @RequestParam Integer state) { return CommonResult.success(baseCaseService ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -1,6 +1,7 @@ package com.ycl.controller.caseHandler; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.ycl.api.CommonResult; import com.ycl.bo.AdminUserDetails; import com.ycl.common.constant.BaseCaseStatus; @@ -43,7 +44,9 @@ @Autowired IWritService iWritService; @Autowired private IBaseCaseService baseCaseService; IBaseCaseService baseCaseService; @Autowired IDisposeRecordService iDisposeRecordService; @ApiOperation(value = "调度") @RequestMapping(value = "/dispatch", method = RequestMethod.POST) @@ -53,8 +56,10 @@ } @ApiOperation(value = "上传违规/违建处置结果") @RequestMapping(value = "/addition_dispose_result/{caseId}/{type}", method = RequestMethod.POST) public CommonResult searchDisposeList(@PathVariable(value = "caseId") Integer caseId, @PathVariable(value = "type") Integer type, @RequestBody UploadDisposingResultParam uploadDisposingResultParam) { @PostMapping("/addition_dispose_result") public CommonResult searchDisposeList(@RequestParam Integer caseId, @RequestParam Integer type, @RequestBody UploadDisposingResultParam uploadDisposingResultParam) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); //修改案件状态为处置 @@ -85,8 +90,8 @@ arrivalSituation.setCreateUser(user.getUserId().intValue()); iArrivalSituationService.save(arrivalSituation); //文书 Integer illegalBuildingType = 02; if (type == illegalBuildingType) { Integer illegalBuildingType = 2; if (type.equals(illegalBuildingType)) { Writ writ = new Writ(); BeanUtils.copyProperties(uploadDisposingResultParam, writ); writ.setBaseCaseId(caseId); @@ -95,7 +100,14 @@ writ.setCreateUser(user.getUserId().intValue()); iWritService.save(writ); } /// TODO: 2022/9/30 添加成功后修改案件专题 添加流程 baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.CHECK)); DisposeRecord disposeRecord = new DisposeRecord(); disposeRecord.setBaseCaseId(caseId); disposeRecord.setState(0); disposeRecord.setCreateTime(LocalDateTime.now()); disposeRecord.setCreateUser(user.getUserId().intValue()); disposeRecord.setStepName("核查"); iDisposeRecordService.save(disposeRecord); return CommonResult.success("add success"); } } ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
@@ -31,7 +31,7 @@ * 所属社区 */ @ApiModelProperty(value = "所属社区") @NotBlank(message = "不允许所属社区为空") @NotNull(message = "不允许所属社区为空") private Integer communityId; @@ -81,7 +81,7 @@ * 违建具体位置 */ @ApiModelProperty(value = "违建具体位置") @NotNull(message = "不允许违建具体位置为空") @NotBlank(message = "不允许违建具体位置为空") private String position; /** ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -8,6 +8,7 @@ import com.ycl.bo.AdminUserDetails; import com.ycl.bo.casePool.CasePoolIllegalBuildingDO; import com.ycl.bo.casePool.CasePoolViolationDO; import com.ycl.common.constant.BaseCaseStatus; import com.ycl.common.util.DateUtil; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; @@ -206,7 +207,7 @@ @Override public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) { IllegalBuilding illegalBuilding = new IllegalBuilding(); BeanUtils.copyProperties(illegalBuilding, illegalBuildingParam); BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding); illegalBuilding.setBaseCaseId(id); Integer value = 1; return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false; @@ -319,11 +320,10 @@ @Override public void endCase(Integer caseId, String result) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); Integer endCaseState = 6; Integer state = 2; Integer state = 1; String endCaseName = "结案"; BaseCase baseCase = new BaseCase(); baseCase.setState(endCaseState); baseCase.setState(BaseCaseStatus.CLOSING_REGISTER); baseCase.setId(caseId); baseCaseMapper.updateById(baseCase); DisposeRecord disposeRecord = new DisposeRecord();
