wl
2022-10-17 66a6b31ddc84644dfcae8a341a99796db76e60a7
上传时间处置 结案处理人添加
7个文件已修改
22 ■■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
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;
@@ -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()));
    }
@@ -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()));
    }
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -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);
    }
}