Browse Source

Merge remote-tracking branch 'origin/workorder0509' into develop

tags/V1.3.2
chenlu 4 months ago
parent
commit
2ec8bda9c8
2 changed files with 23 additions and 1 deletions
  1. +19
    -0
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/SeeQuestionVo.java
  2. +4
    -1
      tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionFileMapper.xml

+ 19
- 0
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/SeeQuestionVo.java View File

package com.tuoheng.miniprogram.vo; package com.tuoheng.miniprogram.vo;


import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;


import java.util.Date;

/** /**
* @Author ChengWang * @Author ChengWang
* @Date 2022/11/28 * @Date 2022/11/28
*/ */
private String handlerUser; private String handlerUser;


/**
* 审核结果 0未审核 1审核通过 2审核未通过
*/
private Integer audit;

/**
* 审核意见
*/
private String auditView;

/**
* 审核时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date auditTime;





} }

+ 4
- 1
tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionFileMapper.xml View File

tfh.handler_image as handlerImage, tfh.handler_image as handlerImage,
tfh.handler_result as handlerResult, tfh.handler_result as handlerResult,
tfh.handler_time as handlerTime, tfh.handler_time as handlerTime,
tfh.handler_user as handlerUser
tfh.handler_user as handlerUser,
tfh.audit as audit,
tfh.audit_view as auditView,
tfh.audit_time as auditTime
from from
th_inspection_file as tf th_inspection_file as tf
left join th_inspection_file_handle AS tfh on tf.id = tfh.inspection_file_id left join th_inspection_file_handle AS tfh on tf.id = tfh.inspection_file_id

Loading…
Cancel
Save