From 243b9066cfcdb9f581d72aecc2908a0cb99702d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Thu, 2 Jun 2022 10:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1DO=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/task/vo/TaskBaseVO.java  |  7 ++--
 .../farm/dal/dataobject/task/TaskDO.java      | 33 +++++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java
index ecaa98f2..dee019aa 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.farm.controller.admin.task.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -23,11 +24,11 @@ public class TaskBaseVO {
     private Integer taskCateName;
 
     @ApiModelProperty(value = "")
-    private Object resources;
-    private Object areas;
+    private JSONArray resources;
+    private JSONArray areas;
 
     private Integer mainPerson;
-    private Object executorPerson;
+    private JSONArray executorPerson;
     private Integer workingHours;
 
     @ApiModelProperty(value = "")
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java
index 6564d9dd..e21fb432 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.task;
 
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
@@ -10,7 +13,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 系统管理员
  */
-@TableName("farm_task")
+@TableName(value = "farm_task", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -19,27 +22,37 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @AllArgsConstructor
 public class TaskDO extends BaseDO {
 
-    /**
-     * 
-     */
     @TableId
     private Long id;
 
+    @ApiModelProperty("项目id")
     private Integer projectId;
+    @ApiModelProperty("作物id")
     private Integer cropId;
+    @ApiModelProperty("作物数量")
     private Integer cropNum;
 
+    @ApiModelProperty("负责人id")
     private Integer mainPerson;
-    private Object executorPerson;
+
+    @ApiModelProperty("执行人idList")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray executorPerson;
+
+    @ApiModelProperty("工时")
     private Integer workingHours;
 
+    @ApiModelProperty("任务id")
     private Integer taskCateId;
+    @ApiModelProperty("任务内容id")
     private Integer taskCateName;
-    /**
-     * 
-     */
-    private Object resources;
-    private Object areas;
+
+    @ApiModelProperty("资源")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray resources;
+    @ApiModelProperty("区域及子区域")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONArray areas;
     /**
      * 
      */