环节用时bug修改。

mg

2022-10-20 9299e747e05d1bc733ce146825d15a48b8c86182

环节用时bug修改。

 ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java

@@ -72,4 +72,6 @@
    @ApiModelProperty(value = "派遣意见")
    private Long createUser;



}

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java

@@ -77,10 +77,10 @@
    @ApiModelProperty(value = "距离")
    private Integer distance;
    /**
     * 处置限时
     * 调度限时
     */
    @TableField("dispose_date")
    @ApiModelProperty(value = "处置限时")
    @ApiModelProperty(value = "调度限时")
    private Date disposeDate;
    /**
     * 派遣意见

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java

@@ -115,5 +115,12 @@
    @ApiModelProperty(value = "违建材料")
    private String materials;

    /**
     * 违建类别文本
     */
    @TableField(value = "category_text",exist = false)
    @ApiModelProperty(value = "违建类别文本")
    private String categoryText;


}

 ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java

@@ -57,13 +57,13 @@
     */
    @TableField("audit_result")
    @ApiModelProperty(value = "审核结果")
    private Integer auditResult;
    private String auditResult;
    /**
     * 审核意见
     */
    @TableField("audit_opinion")
    @ApiModelProperty(value = "审核意见")
    private Integer auditOpinion;
    private String auditOpinion;
    /**
     * 创建人
     */

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

@@ -17,6 +17,7 @@
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.*;
import com.ycl.entity.common.ImageResources;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.*;
@@ -236,7 +237,7 @@
        disposeRecord.setCreateUser(userDetails.getUserId());
        disposeRecord.setStartTime(LocalDateTime.now());
        disposeRecord.setStepName(stepName);
        if(!StringUtils.isEmpty(limitTime)) {
        if (!StringUtils.isEmpty(limitTime)) {
            disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        }
        disposeRecordMapper.insert(disposeRecord);
@@ -270,6 +271,12 @@
            baseCase.setViolations(violations);
        } else {
            IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
            LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
            dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
            DataDictionary dictionary =  dataDictionaryMapper.selectOne(dict);
            if (dictionary != null) {
                illegalBuilding.setCategoryText(dictionary.getName());
            }
            baseCase.setIllegalBuilding(illegalBuilding);
        }
        //获取调度信息
@@ -298,10 +305,10 @@
                continue;
            }
            for (DisposeRecord record : records) {
                if (record != null && record.getEndTime() != null) {
                if (record != null && record.getEndTime() != null && record.getStartTime() != null) {
                    record.setLinkTime(
                            DateUtil.getDistanceDateTime(
                                    DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
                                    DateUtil.fromLocalDateTime(record.getStartTime()),
                                    DateUtil.fromLocalDateTime(record.getEndTime())));
                }
            }

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

@@ -98,6 +98,7 @@
        disposeRecord.setHandlerId(chechParam.getCurrentUser());
        //核查已结束
        disposeRecord.setState(1);
        disposeRecord.setResult(chechParam.getResult());
        disposeRecord.setEndTime(LocalDateTime.now());
        disposeRecordMapper.update(disposeRecord, updateWrapper);


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

@@ -22,7 +22,6 @@

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

/**