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

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/SeeQuestionVo.java

@@ -1,7 +1,10 @@
 package com.tuoheng.miniprogram.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author ChengWang
  * @Date 2022/11/28
@@ -54,6 +57,22 @@ public class SeeQuestionVo {
      */
     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;
+
 
 
 }

tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionFileMapper.xml

@@ -15,7 +15,10 @@
            tfh.handler_image as handlerImage,
            tfh.handler_result as handlerResult,
            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
            th_inspection_file as tf
            left join th_inspection_file_handle AS tfh on tf.id = tfh.inspection_file_id