ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
@@ -49,8 +49,8 @@ .eq(StringUtils.isNotBlank(logQueryParams.getPortEquipment()), UmsAdminLoginLog::getUserAgent, logQueryParams.getPortEquipment()) .eq(logQueryParams.getId() != null, UmsAdminLoginLog::getAdminId, logQueryParams.getId()) .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime()) .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)); .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)); List<UmsAdminLogVO> umsAdminLogVOList = page.getRecords().stream() .map(item -> { UmsAdminLogVO umsAdminlogVO = new UmsAdminLogVO(); @@ -114,8 +114,8 @@ .like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent()) .eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType()) .between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime()) .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) .orderBy(logQueryParams.getSort()!=null&&logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)) .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime) .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime)) .getRecords() .stream() .map(item -> { ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -28,6 +28,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -121,7 +123,7 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "1 违规,2 违建", dataType = "Integer") }) @LogSave(operationType = "事项处置管理",contain = "删除案件") @LogSave(operationType = "事项处置管理", contain = "删除案件") public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) { Integer violationType = 1; Integer illegalBuildingType = 2; @@ -146,7 +148,7 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "1 违规,2 违建", dataType = "Integer") }) @LogSave(operationType = "事项处置管理",contain = "批量删除案件") @LogSave(operationType = "事项处置管理", contain = "批量删除案件") public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) { Integer violationType = 1; Integer illegalBuildingType = 2; @@ -168,7 +170,7 @@ **/ @ApiOperation(value = "添加违规案件") @PostMapping("/addition_violation") @LogSave(operationType = "事项处置管理",contain = "新增违建案件") @LogSave(operationType = "事项处置管理", contain = "新增违建案件") public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) { Integer violation = 1; Integer resource = 2; @@ -178,6 +180,7 @@ baseCase.setCategory(violation); baseCase.setCode(utilNumber.createCaseCode()); baseCase.setState(BaseCaseStatus.PENDING); baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); baseCaseService.save(baseCase); return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId())); } @@ -189,7 +192,7 @@ **/ @ApiOperation(value = "添加违建案件") @PostMapping("/addition_illegal_building") @LogSave(operationType = "事项处置管理",contain = "新增违规案件") @LogSave(operationType = "事项处置管理", contain = "新增违规案件") public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) { Integer illegalBuilding = 2; Integer resource = 2; @@ -199,6 +202,7 @@ baseCase.setEventSource(resource); baseCase.setCode(utilNumber.createCaseCode()); baseCase.setState(BaseCaseStatus.PENDING); baseCase.setAlarmTime(LocalDateTime.parse(illegalBuildingParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); baseCaseService.save(baseCase); return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId())); } @@ -259,9 +263,9 @@ @ApiOperation(value = "结案") @PutMapping("/end_case") @LogSave(operationType = "事项处置管理",contain = "案件结案") public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result,@RequestParam String opinion) { baseCaseService.endCase(caseId, result,opinion); @LogSave(operationType = "事项处置管理", contain = "案件结案") public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result, @RequestParam String opinion) { baseCaseService.endCase(caseId, result, opinion); return CommonResult.success("end case success~!"); }
@@ -78,7 +78,7 @@ BeanUtils.copyProperties(uploadDisposingResultParam, investigation); investigation.setBaseCaseId(caseId); investigation.setCreateTime(LocalDateTime.now()); investigation.setCreateUser(user.getUserId().longValue()); investigation.setCreateUser(user.getUserId()); investigation.setPartyId(partyInfo.getId()); iInvestigationService.save(investigation); //到达 @@ -86,7 +86,7 @@ BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation); arrivalSituation.setBaseCaseId(caseId); arrivalSituation.setCreateTime(LocalDateTime.now()); arrivalSituation.setCreateUser(user.getUserId().longValue()); arrivalSituation.setCreateUser(user.getUserId()); iArrivalSituationService.save(arrivalSituation); //文书 Integer illegalBuildingType = 2; @@ -96,7 +96,7 @@ writ.setBaseCaseId(caseId); writ.setIllegalBuildingId(caseId); writ.setCreateTime(LocalDateTime.now()); writ.setCreateUser(user.getUserId().longValue()); writ.setCreateUser(user.getUserId()); iWritService.save(writ); } baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE)); @@ -105,7 +105,7 @@ disposeRecord.setBaseCaseId(caseId); disposeRecord.setState(0); disposeRecord.setCreateTime(LocalDateTime.now()); disposeRecord.setCreateUser(user.getUserId().longValue()); disposeRecord.setCreateUser(user.getUserId()); disposeRecord.setStepName(stepName); disposeRecord.setStartTime(LocalDateTime.now()); iDisposeRecordService.addRecord(disposeRecord); ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java
@@ -25,7 +25,7 @@ * 报警时间 */ @TableField("alarm_time") private LocalDateTime alarmTime; private String alarmTime; /** * 所属社区 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java
@@ -24,7 +24,7 @@ * 报警时间 */ @TableField("alarm_time") private LocalDateTime alarmTime; private String alarmTime; /** * 小类 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -1,12 +1,15 @@ package com.ycl.entity.caseHandler; import cn.hutool.core.date.LocalDateTimeUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDateTime; ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -388,10 +388,11 @@ //修改结案记录 DisposeRecord disposeRecord = new DisposeRecord(); disposeRecord.setHandlerId(user.getUserId().longValue()); disposeRecord.setHandlerId(user.getUserId()); //结案已结束 disposeRecord.setState(1); disposeRecord.setEndTime(LocalDateTime.now()); disposeRecord.setHandlerId(user.getUserId()); disposeRecordMapper.update(disposeRecord, updateWrapper); } }
