项目 任务

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -31,6 +32,8 @@ public class ProjectBaseVO {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Object members;
+
     @ApiModelProperty(value = "")
     private String images;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -27,6 +28,7 @@ public class ProjectExcelVO {
     private Integer state;
 
     private Object areas;
+    private Object members;
 
     private Integer cropId;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -26,6 +27,7 @@ public class ProjectExportReqVO {
 
     @ApiModelProperty(value = "")
     private Object resources;
+    private Object members;
 
     @ApiModelProperty(value = "")
     private String images;

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -23,6 +24,7 @@ public class ProjectPageReqVO extends PageParam {
     private Integer state;
 
     private Object areas;
+    private Object members;
 
     private Integer cropId;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.project.vo;
 
+import cn.hutool.json.JSON;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +35,8 @@ public class ProjectSearchPageReqVO extends PageParam {
     @ApiModelProperty(value = "")
     private String resources;
 
+    private Object members;
+
     @ApiModelProperty(value = "")
     private String images;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java

@@ -28,6 +28,10 @@ public class TaskBaseVO {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object images;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java

@@ -33,6 +33,10 @@ public class TaskExcelVO {
     @ExcelProperty("")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ExcelProperty("")
     private Object images;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java

@@ -25,6 +25,10 @@ public class TaskExportReqVO {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object images;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java

@@ -27,6 +27,10 @@ public class TaskPageReqVO extends PageParam {
     @ApiModelProperty(value = "")
     private Object resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object images;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java

@@ -32,6 +32,10 @@ public class TaskPageSearchReqVO extends PageParam {
     @ApiModelProperty(value = "")
     private String resources;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     @ApiModelProperty(value = "")
     private Object images;
 

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.project;
 
+import cn.hutool.json.JSON;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -41,6 +42,8 @@ public class ProjectDO extends BaseDO {
      * 
      */
     private Object resources;
+
+    private Object members;
     /**
      * 
      */
@@ -58,4 +61,6 @@ public class ProjectDO extends BaseDO {
      */
     private Integer weight;
 
+    private Integer tenantId;
+
 }

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java

@@ -29,6 +29,10 @@ public class TaskDO extends BaseDO {
     private Integer cropId;
     private Integer cropNum;
 
+    private Integer mainPerson;
+    private Object executorPerson;
+    private Integer workingHours;
+
     /**
      * 
      */