Browse Source

fix: 补充上传时间字段

master_tdsql
hxh 10 months ago
parent
commit
704a74c658
  1. 5
      shuili-system/src/main/java/com/kms/yxgh/base/enums/RecordStatus.java
  2. 4
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java
  3. 13
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

5
shuili-system/src/main/java/com/kms/yxgh/base/enums/RecordStatus.java

@ -13,8 +13,9 @@ import lombok.Getter;
@Getter
public enum RecordStatus {
CHECKING("处置中", 0L),
FINISHED("已完成", 1L);
CHECKING("巡查中", 0L),
FINISHED("已完成", 1L),
HANDLE("处置中", 2L);
private final Long value;
private final String name;

4
shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java

@ -138,6 +138,10 @@ public class DfRecordDetailDto {
@ApiModelProperty("处置时间")
private Date handleTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("上传时间")
private Date createTime;
@ApiModelProperty("处置图片")
private List<String> handleImages = Collections.emptyList();
}

13
shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

@ -86,7 +86,6 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
if (record == null) {
throw new DfException("巡查记录不能为空");
}
record.setStatus(getStatus(dto));
int rsp = getBaseMapper().insert(record);
if (rsp <= 0) {
throw new DfException("新增巡查记录失败");
@ -113,18 +112,6 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
};
}
private String getStatus(DfRecordDetailDto dto) {
if (CollectionUtil.isNotEmpty(dto.getItems())) {
if (dto.getItems().stream().anyMatch(o -> o.getHandleImages().isEmpty())) {
return RecordStatus.CHECKING.getValue().toString();
} else {
return RecordStatus.FINISHED.getValue().toString();
}
}
return RecordStatus.CHECKING.getValue().toString();
}
public DfRecordDetailDto getDetailById(String id) {
DfRecord record = this.getBaseMapper().selectById(id);
if (record != null) {

Loading…
Cancel
Save