Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
wanjing 1 year ago
parent
commit
1d0702651f
4 changed files with 9 additions and 4 deletions
  1. +4
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/workorder/WorkOrderDetailsVo.java
  2. +4
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/workorder/WorkOrderPageListVo.java
  3. +0
    -3
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java
  4. +1
    -1
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

+ 4
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/workorder/WorkOrderDetailsVo.java View File

package com.tuoheng.admin.vo.workorder; package com.tuoheng.admin.vo.workorder;


import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;


import java.util.Date; import java.util.Date;


/** /**
* 工单生成时间 * 工单生成时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;


/** /**

+ 4
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/workorder/WorkOrderPageListVo.java View File

package com.tuoheng.admin.vo.workorder; package com.tuoheng.admin.vo.workorder;


import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;


import java.util.Date; import java.util.Date;


/** /**
* 指派时间 * 指派时间
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date assignTime; private Date assignTime;


/** /**

+ 0
- 3
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java View File

return JsonResult.error("未查询出对应的问题及处理结果"); return JsonResult.error("未查询出对应的问题及处理结果");
} }
//对属性处理 //对属性处理
if (StringUtils.isNotEmpty(vo.getFileOriginal())) {
vo.setFileOriginal(CommonConfig.imageURL + vo.getFileOriginal());
}
if (StringUtils.isNotEmpty(vo.getFileImage())) { if (StringUtils.isNotEmpty(vo.getFileImage())) {
vo.setFileImage(CommonConfig.imageURL + vo.getFileImage()); vo.setFileImage(CommonConfig.imageURL + vo.getFileImage());
} }

+ 1
- 1
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java View File

covert.setFileThumbnail(CommonConfig.imageURL + p.getFileThumbnail()); covert.setFileThumbnail(CommonConfig.imageURL + p.getFileThumbnail());
} }
if (StringUtils.isNotEmpty(p.getFileOriginal())) { if (StringUtils.isNotEmpty(p.getFileOriginal())) {
covert.setFileOriginal(CommonConfig.imageURL + p.getFileThumbnail());
covert.setFileOriginal(CommonConfig.imageURL + p.getFileOriginal());
} }
//任务名称 任务执行时间 道路位置编号 //任务名称 任务执行时间 道路位置编号
if (StringUtils.isEmpty(p.getInspectionId())) { if (StringUtils.isEmpty(p.getInspectionId())) {

Loading…
Cancel
Save