外部报验功能-结构机号不展示问题

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxOutsideInspectionItpDo.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author wm
- * @since 2024-01-06
+ * @since 2024-01-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -255,6 +255,26 @@ public class ZhcxOutsideInspectionItpDo extends BaseDo {
      */
     @TableField("LIFECYCLE")
     private String lifecycle;
+    /**
+     * 结构项目机号id
+     */
+    @TableField("STRUCTUREMACHINEID")
+    private String structuremachineid;
+    /**
+     * 结构机号
+     */
+    @TableField("STRUCTUREMACHINENO")
+    private String structuremachineno;
+    /**
+     * 自检员id
+     */
+    @TableField("SELFTESTERID")
+    private String selftesterid;
+    /**
+     * 报验完成时间
+     */
+    @TableField("INSPECTIONCOMPLATETIME")
+    private Date inspectioncomplatetime;
 
 
 }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxOutsideInspectionItpSupervisionDispatchDo.java

@@ -1,26 +1,26 @@
 package com.rongwei.bsentity.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * <p>
  * 外部报验-ITP报验-监理派单
  * </p>
  *
  * @author wm
- * @since 2023-12-26
+ * @since 2024-01-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("zhcx_outside_inspection_itp_supervision_dispatch")
+@TableName("ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH")
 public class ZhcxOutsideInspectionItpSupervisionDispatchDo extends BaseDo {
 
     private static final long serialVersionUID=1L;
@@ -28,7 +28,7 @@ public class ZhcxOutsideInspectionItpSupervisionDispatchDo extends BaseDo {
     /**
      * 主键
      */
-    @TableId("ID")
+    @TableField("ID")
     private String id;
     /**
      * 租户ID
@@ -55,11 +55,6 @@ public class ZhcxOutsideInspectionItpSupervisionDispatchDo extends BaseDo {
      */
     @TableField("SUPERVISIONID")
     private String supervisionid;
-    /**
-     * 监理用户账号
-     */
-    @TableField("SUPERVISIONACCOUNT")
-    private String supervisionaccount;
     /**
      * 监理用户
      */
@@ -80,31 +75,51 @@ public class ZhcxOutsideInspectionItpSupervisionDispatchDo extends BaseDo {
      */
     @TableField("CHECKENDTIME")
     private Date checkendtime;
+    /**
+     * 取消类型
+     */
+    @TableField("CANCELTYPE")
+    private String canceltype;
+    /**
+     * 附件
+     */
+    @TableField("SFILES")
+    private String sfiles;
     /**
      * 派单状态
      */
     @TableField("DISPATCHSTATUS")
     private String dispatchstatus;
     /**
-     * 取消类型
+     * 监理用户账号
      */
-    @TableField("CANCELTYPE")
-    private String canceltype;
+    @TableField("SUPERVISIONACCOUNT")
+    private String supervisionaccount;
+    /**
+     * 检验员备注（拒收原因，取消原因）
+     */
+    @TableField("REFUSEREASON")
+    private String refusereason;
+    /**
+     * 监理用户userId
+     */
+    @TableField("SUPERVISIONUSERID")
+    private String supervisionuserid;
     /**
      * 取消原因
      */
     @TableField("CANCELREASON")
     private String cancelreason;
     /**
-     * 附件
+     * 上次检验员备注
      */
-    @TableField("SFILES")
-    private String sfiles;
+    @TableField("LASTREFUSEREASON")
+    private String lastrefusereason;
     /**
-     * 拒绝原因
+     * 监理用户备注
      */
-    @TableField("REFUSEREASON")
-    private String refusereason;
+    @TableField("JREMARK")
+    private String jremark;
     /**
      * 画布
      */
@@ -115,12 +130,6 @@ public class ZhcxOutsideInspectionItpSupervisionDispatchDo extends BaseDo {
      */
     @TableField("SIGNATURE")
     private String signature;
-    /**
-     *
-     */
-    @TableField("LASTREFUSEREASON")
-    private String lastrefusereason;
 
-    @TableField("SUPERVISIONUSERID")
-    private String supervisionuserid;
+
 }