"工程管理"

flow_project/src/main/java/com/tofly/project/entity/ProjectConstruction.java

@@ -71,6 +71,13 @@ public class ProjectConstruction extends Model<ProjectConstruction> {
     @ApiModelProperty(value = "施工类型（字典取值）")
     private Long dataType;
 
+    /**
+     * 工程状态
+     */
+    @Excel(name = "工程状态")
+    @ApiModelProperty(value = "工程状态")
+    private String status;
+
     /**
      * 施工负责人
      */

flow_project/src/main/java/com/tofly/project/entity/ProjectRegistration.java

@@ -72,6 +72,13 @@ public class ProjectRegistration extends Model<ProjectRegistration> {
     @TableField(exist = false)
     private String dataTypeName;
 
+    /**
+     * 工程状态
+     */
+    @Excel(name = "工程状态")
+    @ApiModelProperty(value = "工程状态")
+    private String status;
+
     /**
      * 联系人
      */

flow_project/src/main/java/com/tofly/project/entity/ProjectSupervision.java

@@ -114,6 +114,27 @@ public class ProjectSupervision extends Model<ProjectSupervision> {
     @ApiModelProperty(value = "排序")
     private Long sort;
 
+    /**
+     * 监管类型
+     */
+    @Excel(name = "监管类型")
+    @ApiModelProperty(value = "监管类型")
+    private String type;
+
+    /**
+     * 监管开始时间
+     */
+    @Excel(name = "监管开始时间")
+    @ApiModelProperty(value = "监管开始时间")
+    private Date superviseStartTime;
+
+    /**
+     * 监管结束时间
+     */
+    @Excel(name = "监管结束时间")
+    @ApiModelProperty(value = "监管结束时间")
+    private Date superviseEndTime;
+
     /**
      * 逻辑删除，1删除，0不删除
      */

flow_project/src/main/resources/mapper/project/ProjectConstructionMapper.xml

@@ -7,6 +7,7 @@
         <result property="projectId" column="PROJECT_ID" jdbcType="INTEGER"/>
         <result property="unit" column="UNIT" jdbcType="VARCHAR"/>
         <result property="dataType" column="DATA_TYPE" jdbcType="INTEGER"/>
+        <result property="status" column="STATUS" jdbcType="VARCHAR"/>
         <result property="contacts" column="CONTACTS" jdbcType="VARCHAR"/>
         <result property="contactsPhone" column="CONTACTS_PHONE" jdbcType="VARCHAR"/>
         <result property="plannedDuration" column="PLANNED_DURATION" jdbcType="VARCHAR"/>

flow_project/src/main/resources/mapper/project/ProjectRegistrationMapper.xml

@@ -7,6 +7,7 @@
         <result property="name" column="NAME" jdbcType="VARCHAR"/>
         <result property="address" column="ADDRESS" jdbcType="VARCHAR"/>
         <result property="dataType" column="DATA_TYPE" jdbcType="INTEGER"/>
+        <result property="status" column="STATUS" jdbcType="VARCHAR"/>
         <result property="contacts" column="CONTACTS" jdbcType="VARCHAR"/>
         <result property="contactsPhone" column="CONTACTS_PHONE" jdbcType="VARCHAR"/>
         <result property="longitude" column="LONGITUDE" jdbcType="VARCHAR"/>

flow_project/src/main/resources/mapper/project/ProjectSupervisionMapper.xml

@@ -12,6 +12,9 @@
         <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
         <result property="annex" column="ANNEX" jdbcType="VARCHAR"/>
         <result property="sort" column="SORT" jdbcType="INTEGER"/>
+        <result property="type" column="TYPE" jdbcType="VARCHAR"/>
+        <result property="superviseStartTime" column="SUPERVISE_START_TIME" jdbcType="TIMESTAMP"/>
+        <result property="superviseEndTime" column="SUPERVISE_END_TIME" jdbcType="TIMESTAMP"/>
         <result property="deleted" column="DELETED" jdbcType="VARCHAR"/>
         <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
         <result property="createUser" column="CREATE_USER" jdbcType="INTEGER"/>