feature:工程装置施工、检验历史表字段调整提交

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgProjectConstructionDto.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -20,83 +21,61 @@ public class IdxBizJgProjectConstructionDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
-    @TableId("SEQUENCE_NBR")
     private String sequenceNbr;
 
-    @TableField("RECORD")
     private String record;
 
-    @TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
-    @TableField("REC_USER_ID")
     private String recUserId;
 
-    @TableField("INSTANCE_ID")
     private String instanceId;
 
-    @TableField("STATUS")
     private String status;
 
     @ApiModelProperty(value = "施工类型")
-    @TableField("CONSTRUCTION_TYPE")
     private String constructionType;
 
     @ApiModelProperty(value = "施工单位统一社会信用代码")
-    @TableField("USC_UNIT_CREDIT_CODE")
     private String uscUnitCreditCode;
 
     @ApiModelProperty(value = "施工单位名称")
-    @TableField("USC_UNIT_NAME")
     private String uscUnitName;
 
     @ApiModelProperty(value = "施工时间")
-    @TableField("USC_DATE")
-    private LocalDateTime uscDate;
+    private Date uscDate;
 
     @ApiModelProperty(value = "工程装置唯一标识")
-    @TableField("SEQUENCE_CODE")
     private String sequenceCode;
 
     @ApiModelProperty(value = "告知业务id")
-    @TableField("NOTICE_ID")
     private String noticeId;
 
     @ApiModelProperty(value = "告知书编号")
-    @TableField("INFORM_CODE")
     private String informCode;
 
     @ApiModelProperty(value = "告知书路径")
-    @TableField("INFORM_FILE_PATH")
     private String informFilePath;
 
     @ApiModelProperty(value = "施工负责人ID")
-    @TableField("CONSTRUCTION_LEADER_ID")
     private String constructionLeaderId;
 
     @ApiModelProperty(value = "施工负责人")
-    @TableField("CONSTRUCTION_LEADER_NAME")
     private String constructionLeaderName;
 
     @ApiModelProperty(value = "施工负责人手机")
-    @TableField("CONSTRUCTION_LEADER_PHONE")
     private String constructionLeaderPhone;
 
     @ApiModelProperty(value = "施工委托书图片")
-    @TableField("PROXY_STATEMENT_ATTACHMENT")
     private String proxyStatementAttachment;
 
     @ApiModelProperty(value = "施工合同照片")
-    @TableField("CONSTRUCTION_CONTRACT_ATTACHMENT")
     private String constructionContractAttachment;
 
     @ApiModelProperty(value = "其他附件")
-    @TableField("CONSTRUCTION_OTHER_ACCESSORIES")
     private String constructionOtherAccessories;
 
     @ApiModelProperty(value = "关联设备ids")
-    @TableField("EQUIP_RECORDS")
     private String equipRecords;
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgProjectInspectionDto.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -20,83 +21,61 @@ public class IdxBizJgProjectInspectionDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
-    @TableId("SEQUENCE_NBR")
     private String sequenceNbr;
 
-    @TableField("RECORD")
     private String record;
 
-    @TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
-    @TableField("REC_USER_ID")
     private String recUserId;
 
-    @TableField("INSTANCE_ID")
     private String instanceId;
 
-    @TableField("STATUS")
     private String status;
 
     @ApiModelProperty(value = "检验类型")
-    @TableField("INSPECT_TYPE")
     private String inspectType;
 
     @ApiModelProperty(value = "检验机构名称")
-    @TableField("INSPECT_ORG_NAME")
     private String inspectOrgName;
 
     @ApiModelProperty(value = "检验报告")
-    @TableField("INSPECT_REPORT")
     private String inspectReport;
 
     @ApiModelProperty(value = "检验人员")
-    @TableField("INSPECT_STAFF")
     private String inspectStaff;
 
     @ApiModelProperty(value = "检验日期")
-    @TableField("INSPECT_DATE")
-    private LocalDateTime inspectDate;
+    private Date inspectDate;
 
     @ApiModelProperty(value = "检验结论")
-    @TableField("INSPECT_CONCLUSION")
     private String inspectConclusion;
 
     @ApiModelProperty(value = "安全状况等级")
-    @TableField("SAFETY_LEVEL")
     private String safetyLevel;
 
     @ApiModelProperty(value = "检验问题备注")
-    @TableField("PROBLEM_REMARK")
     private String problemRemark;
 
     @ApiModelProperty(value = "下次检验日期")
-    @TableField("NEXT_INSPECT_DATE")
-    private LocalDateTime nextInspectDate;
+    private Date nextInspectDate;
 
     @ApiModelProperty(value = "工程装置唯一标识")
-    @TableField("SEQUENCE_CODE")
     private String sequenceCode;
 
     @ApiModelProperty(value = "检验机构统一信用代码")
-    @TableField("INSPECT_ORG_CODE")
     private String inspectOrgCode;
 
     @ApiModelProperty(value = "检验报告编号")
-    @TableField("INSPECT_REPORT_NO")
     private String inspectReportNo;
 
     @ApiModelProperty(value = "检验人员主键多个逗号分割")
-    @TableField("INSPECT_STAFF_CODE")
     private String inspectStaffCode;
 
     @ApiModelProperty(value = "关联设备ids")
-    @TableField("EQUIP_RECORD")
     private String equipRecord;
 
     @ApiModelProperty(value = "检验申请单编号")
-    @TableField("INSPECT_APPLY_NO")
     private String inspectApplyNo;
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectConstruction.java

@@ -38,7 +38,7 @@ public class IdxBizJgProjectConstruction extends BaseEntity {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -80,7 +80,7 @@ public class IdxBizJgProjectConstruction extends BaseEntity {
      * 施工时间
      */
 	@TableField("USC_DATE")
-    private LocalDateTime uscDate;
+    private Date uscDate;
 
     /**
      * 工程装置唯一标识

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectInspection.java

@@ -38,7 +38,7 @@ public class IdxBizJgProjectInspection extends BaseEntity {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -86,7 +86,7 @@ public class IdxBizJgProjectInspection extends BaseEntity {
      * 检验日期
      */
 	@TableField("INSPECT_DATE")
-    private LocalDateTime inspectDate;
+    private Date inspectDate;
 
     /**
      * 检验结论
@@ -110,7 +110,7 @@ public class IdxBizJgProjectInspection extends BaseEntity {
      * 下次检验日期
      */
 	@TableField("NEXT_INSPECT_DATE")
-    private LocalDateTime nextInspectDate;
+    private Date nextInspectDate;
 
     /**
      * 工程装置唯一标识