更改task和dto

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TaskDto.java

@@ -17,13 +17,23 @@ public class TaskDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
-    String content;
-    Date sendTime;
-    boolean status;
-    String statusLabel;
-    String taskType;
-    String taskTypeLabel;
-    String title;
-    String agencyCode = "ugp";
+
+    private String title;
+
+    private Long projectId;
+
+    private Boolean status;
+
+    private String statusLabel;
+
+    private String taskType;
+
+    private String taskTypeLabel;
+
+    private String content;
+
+    private String agencyCode;
+
+    private Integer companyId;
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Task.java

 package com.yeejoin.amos.boot.module.ugp.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,6 +19,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="TzUgpTask对象", description="监检任务表")
+@TableName("tz_ugp_task")
 public class Task extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -27,23 +29,28 @@ public class Task extends BaseEntity {
 
 
     @ApiModelProperty(value = "任务名称")
-    private String name;
+    private String title;
 
-    @ApiModelProperty(value = "焊工id")
-    private String welderId;
+
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
 
     @ApiModelProperty(value = "任务状态（0：未开始 1：进行中 2：已结束）")
-    private String status;
+    private Boolean status;
 
     @ApiModelProperty(value = "任务开始时间")
-    private Date startTime;
+    private String statusLabel;
 
     @ApiModelProperty(value = "任务结束时间")
-    private Date overTime;
+    private String taskType;
+
+    private String taskTypeLabel;
+    private String content;
+    private String agencyCode;
+    private Integer companyId;
+
 
 
-    @ApiModelProperty(value = "项目id")
-    private Long projectId;
 
 
 }