diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java index 842af273..861501c9 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropBaseVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.crop.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -17,7 +18,7 @@ public class CropBaseVO { private String name; @ApiModelProperty(value = "物料图片") - private String images; + private JSONArray images; @ApiModelProperty(value = "当前库存", required = true) @NotNull(message = "当前库存不能为空") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java index 0dacdb13..179a23b1 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExcelVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.crop.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -21,7 +22,7 @@ public class CropExcelVO { private String name; @ExcelProperty("物料图片") - private String images; + private JSONArray images; @ExcelProperty("当前库存") private Integer stock; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java index 67dc3350..b15b4072 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropExportReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.crop.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -16,7 +17,7 @@ public class CropExportReqVO { private String name; @ApiModelProperty(value = "物料图片") - private String images; + private JSONArray images; @ApiModelProperty(value = "当前库存") private Integer stock; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java index 7141680d..b282a9cd 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/crop/vo/CropPageReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.crop.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -18,7 +19,7 @@ public class CropPageReqVO extends PageParam { private String name; @ApiModelProperty(value = "物料图片") - private String images; + private JSONArray images; @ApiModelProperty(value = "当前库存") private Integer stock; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java index 84fa6209..9e4235dc 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventBaseVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.event.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -27,6 +28,6 @@ public class EventBaseVO { private String content; @ApiModelProperty(value = "") - private String images; + private JSONArray images; } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java index 29a23f58..f5bda1c2 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExcelVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.event.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -30,7 +31,7 @@ public class EventExcelVO { private String content; @ExcelProperty("") - private String images; + private JSONArray images; @ExcelProperty("") private Date createTime; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java index 0d2183c9..804f6733 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventExportReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.event.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -25,7 +26,7 @@ public class EventExportReqVO { private String content; @ApiModelProperty(value = "") - private String images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java index 53904d23..7ab09c1e 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventPageReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.event.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -27,7 +28,7 @@ public class EventPageReqVO extends PageParam { private String content; @ApiModelProperty(value = "") - private String images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java index a591344c..c7dc4587 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/event/vo/EventSearchPageReqVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.event.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import com.alibaba.fastjson.JSONArray; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,7 +33,7 @@ public class EventSearchPageReqVO extends PageParam { private String content; @ApiModelProperty(value = "") - private String images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java index a30948a5..b7cffa65 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java @@ -34,8 +34,8 @@ public class ProjectBaseVO { @ApiModelProperty("成员选择") private JSONArray members; - @ApiModelProperty(value = "") - private String images; + @ApiModelProperty(value = "项目图片") + private JSONArray images; @ApiModelProperty(value = "") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java index 43a6a8fc..4078689d 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.project.vo; import cn.hutool.json.JSON; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -27,16 +28,13 @@ public class ProjectExcelVO { @ExcelProperty("") private Integer state; - private Object areas; - private Object members; + private JSONArray areas; + private JSONArray members; private Integer cropId; - @ExcelProperty("") - private Object resources; - - @ExcelProperty("") - private String images; + @ExcelProperty("项目图片") + private JSONArray images; @ExcelProperty("") private Date planStartTime; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java index ba822b4a..be5bce33 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.project.vo; import cn.hutool.json.JSON; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -21,16 +22,14 @@ public class ProjectExportReqVO { private Integer state; - private Object areas; + private JSONArray areas; private Integer cropId; - @ApiModelProperty(value = "") - private Object resources; - private Object members; + private JSONArray members; - @ApiModelProperty(value = "") - private String images; + @ApiModelProperty(value = "项目图片") + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java index ec385a27..c63cf2c6 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.project.vo; import cn.hutool.json.JSON; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -23,16 +24,13 @@ public class ProjectPageReqVO extends PageParam { private Integer state; - private Object areas; - private Object members; + private JSONArray areas; + private JSONArray members; private Integer cropId; - @ApiModelProperty(value = "") - private Object resources; - - @ApiModelProperty(value = "") - private String images; + @ApiModelProperty(value = "项目图片") + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java index 2f75333a..35c948b6 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.project.vo; import cn.hutool.json.JSON; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import com.alibaba.fastjson.JSONArray; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,17 +29,14 @@ public class ProjectSearchPageReqVO extends PageParam { private Integer state; - private Object areas; + private JSONArray areas; private Integer cropId; - @ApiModelProperty(value = "") - private String resources; - - private Object members; + private JSONArray members; @ApiModelProperty(value = "") - private String images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceBaseVO.java index fba79ec7..f623e491 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceBaseVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.resource.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -25,7 +26,7 @@ public class ResourceBaseVO { private String content; @ApiModelProperty(value = "") - private String images; + private JSONArray images; @ApiModelProperty(value = "") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExcelVO.java index 3cdb362b..02524461 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExcelVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.resource.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -27,7 +28,7 @@ public class ResourceExcelVO { private String content; @ExcelProperty("") - private String images; + private JSONArray images; @ExcelProperty("") private Date validityStartTime; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExportReqVO.java index 9f7f000f..a0800293 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourceExportReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.resource.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -22,7 +23,7 @@ public class ResourceExportReqVO { private String content; @ApiModelProperty(value = "") - private String images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourcePageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourcePageReqVO.java index 283d2086..db79355c 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourcePageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/resource/vo/ResourcePageReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.resource.vo; +import com.alibaba.fastjson.JSONArray; import lombok.*; import java.util.*; import io.swagger.annotations.*; @@ -24,7 +25,7 @@ public class ResourcePageReqVO extends PageParam { private String content; @ApiModelProperty(value = "") - private String images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") 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 79b09dd4..b3439f2b 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 @@ -32,7 +32,7 @@ public class TaskBaseVO { private Integer workingHours; @ApiModelProperty(value = "") - private Object images; + private JSONArray images; @ApiModelProperty(value = "") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java index 28b10b28..4cc4e218 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.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.*; @@ -28,15 +29,15 @@ public class TaskExcelVO { private Integer taskCateName; @ExcelProperty("") - private Object resources; - private Object areas; + private JSONArray resources; + private JSONArray areas; private Integer mainPerson; - private Object executorPerson; + private JSONArray executorPerson; private Integer workingHours; @ExcelProperty("") - private Object images; + private JSONArray images; @ExcelProperty("") private Date planStartTime; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java index e72bbda9..2ec1d71e 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.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.*; @@ -20,15 +21,15 @@ public class TaskExportReqVO { 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 = "") - private Object images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java index ec709fe1..d6ad9d95 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.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.*; @@ -22,15 +23,15 @@ public class TaskPageReqVO extends PageParam { 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 = "") - private Object images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java index 05854a7b..d6872d87 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.task.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import com.alibaba.fastjson.JSONArray; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -27,15 +28,16 @@ public class TaskPageSearchReqVO extends PageParam { private Integer taskCateName; @ApiModelProperty(value = "") - private String resources; - private Object areas; + private JSONArray resources; + private JSONArray areas; + private Integer mainPerson; - private Object executorPerson; + private JSONArray executorPerson; private Integer workingHours; @ApiModelProperty(value = "") - private Object images; + private JSONArray images; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @ApiModelProperty(value = "开始") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java index db3701c4..eb975120 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/crop/CropDO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.crop; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.*; import java.util.*; import com.baomidou.mybatisplus.annotation.*; @@ -10,7 +12,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; * * @author 系统管理员 */ -@TableName("farm_crop") +@TableName(value = "farm_crop", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -31,7 +33,8 @@ public class CropDO extends BaseDO { /** * 物料图片 */ - private String images; + @TableField(typeHandler = JacksonTypeHandler.class) + private JSONArray images; /** * 当前库存 */ diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java index 52186737..2e025e65 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/event/EventDO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.event; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.*; import java.util.*; import com.baomidou.mybatisplus.annotation.*; @@ -10,7 +12,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; * * @author 系统管理员 */ -@TableName("farm_event") +@TableName(value = "farm_event", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -43,6 +45,7 @@ public class EventDO extends BaseDO { /** * */ - private String images; + @TableField(typeHandler = JacksonTypeHandler.class) + private JSONArray images; } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java index f646f84a..1d0886aa 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java @@ -49,7 +49,8 @@ public class ProjectDO extends BaseDO { /** * */ - private String images; + @TableField(typeHandler = JacksonTypeHandler.class) + private JSONArray images; /** * */ diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/resource/ResourceDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/resource/ResourceDO.java index 45de43c1..bf4204eb 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/resource/ResourceDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/resource/ResourceDO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.resource; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.*; import java.util.*; import com.baomidou.mybatisplus.annotation.*; @@ -10,7 +12,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; * * @author 系统管理员 */ -@TableName("farm_resource") +@TableName(value = "farm_resource", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -39,7 +41,8 @@ public class ResourceDO extends BaseDO { /** * */ - private String images; + @TableField(typeHandler = JacksonTypeHandler.class) + private JSONArray images; /** * */ 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 8d834f8e..ce6680a6 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 @@ -54,10 +54,10 @@ public class TaskDO extends BaseDO { @ApiModelProperty("区域及子区域") @TableField(typeHandler = JacksonTypeHandler.class) private JSONArray areas; - /** - * - */ - private Object images; + + @ApiModelProperty("任务图片") + @TableField(typeHandler = JacksonTypeHandler.class) + private JSONArray images; /** * */ diff --git a/zsw-farm/zsw-farm-impl/src/test/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImplTest.java b/zsw-farm/zsw-farm-impl/src/test/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImplTest.java index 2bb23370..76ca6085 100644 --- a/zsw-farm/zsw-farm-impl/src/test/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImplTest.java +++ b/zsw-farm/zsw-farm-impl/src/test/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImplTest.java @@ -135,7 +135,6 @@ public class ProjectServiceImplTest extends BaseDbUnitTest { ProjectPageReqVO reqVO = new ProjectPageReqVO(); reqVO.setName(null); reqVO.setContent(null); - reqVO.setResources(null); reqVO.setImages(null); reqVO.setBeginPlanStartTime(null); reqVO.setEndPlanStartTime(null); @@ -185,7 +184,6 @@ public class ProjectServiceImplTest extends BaseDbUnitTest { ProjectExportReqVO reqVO = new ProjectExportReqVO(); reqVO.setName(null); reqVO.setContent(null); - reqVO.setResources(null); reqVO.setImages(null); reqVO.setBeginPlanStartTime(null); reqVO.setEndPlanStartTime(null);