From d434b2084fecd3545662ed27ec683a3c04890049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com> Date: Tue, 31 May 2022 16:05:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../farm/controller/admin/task/vo/TaskBaseVO.java | 7 ++----- .../farm/controller/admin/task/vo/TaskExcelVO.java | 7 ++----- .../farm/controller/admin/task/vo/TaskExportReqVO.java | 7 ++----- .../farm/controller/admin/task/vo/TaskPageReqVO.java | 7 ++----- .../controller/admin/task/vo/TaskPageSearchReqVO.java | 7 ++----- .../yudao/module/farm/dal/dataobject/task/TaskDO.java | 10 ++-------- .../yudao/module/farm/dal/mysql/task/TaskMapper.java | 8 ++++---- 7 files changed, 16 insertions(+), 37 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 7b2c6bd9..a251e793 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 @@ -19,11 +19,8 @@ public class TaskBaseVO { private Integer cropId; private Integer cropNum; - @ApiModelProperty(value = "") - private String name; - - @ApiModelProperty(value = "") - private String content; + private Integer taskCateId; + private Integer taskCateName; @ApiModelProperty(value = "") private Object resources; 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 78b98340..6d1cdfb2 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 @@ -24,11 +24,8 @@ public class TaskExcelVO { @ExcelProperty("") private Integer cropNum; - @ExcelProperty("") - private String name; - - @ExcelProperty("") - private String content; + private Integer taskCateId; + private Integer taskCateName; @ExcelProperty("") private Object resources; 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 551c5c50..9aa67d4c 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 @@ -16,11 +16,8 @@ public class TaskExportReqVO { private Integer cropId; private Integer cropNum; - @ApiModelProperty(value = "") - private String name; - - @ApiModelProperty(value = "") - private String content; + private Integer taskCateId; + private Integer taskCateName; @ApiModelProperty(value = "") private Object resources; 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 e413e7bc..df89c26f 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 @@ -18,11 +18,8 @@ public class TaskPageReqVO extends PageParam { private Integer cropId; private Integer cropNum; - @ApiModelProperty(value = "") - private String name; - - @ApiModelProperty(value = "") - private String content; + private Integer taskCateId; + private Integer taskCateName; @ApiModelProperty(value = "") private Object resources; 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 97967da7..b661d1f1 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 @@ -23,11 +23,8 @@ public class TaskPageSearchReqVO extends PageParam { private Integer cropId; private Integer cropNum; - @ApiModelProperty(value = "") - private String name; - - @ApiModelProperty(value = "") - private String content; + private Integer taskCateId; + private Integer taskCateName; @ApiModelProperty(value = "") private String resources; 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 fb762e9d..3c4f7b7b 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 @@ -33,14 +33,8 @@ public class TaskDO extends BaseDO { private Object executorPerson; private Integer workingHours; - /** - * - */ - private String name; - /** - * - */ - private String content; + private Integer taskCateId; + private Integer taskCateName; /** * */ diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/task/TaskMapper.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/task/TaskMapper.java index 90e7ce4a..6b798e29 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/task/TaskMapper.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/task/TaskMapper.java @@ -22,8 +22,8 @@ public interface TaskMapper extends BaseMapperX { .eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId()) .eqIfPresent(TaskDO::getCropId, reqVO.getCropId()) .eqIfPresent(TaskDO::getCropNum, reqVO.getCropNum()) - .likeIfPresent(TaskDO::getName, reqVO.getName()) - .eqIfPresent(TaskDO::getContent, reqVO.getContent()) + .eqIfPresent(TaskDO::getTaskCateId, reqVO.getTaskCateId()) + .eqIfPresent(TaskDO::getTaskCateName, reqVO.getTaskCateName()) .eqIfPresent(TaskDO::getResources, reqVO.getResources()) .eqIfPresent(TaskDO::getImages, reqVO.getImages()) .betweenIfPresent(TaskDO::getPlanStartTime, reqVO.getBeginPlanStartTime(), reqVO.getEndPlanStartTime()) @@ -38,8 +38,8 @@ public interface TaskMapper extends BaseMapperX { .eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId()) .eqIfPresent(TaskDO::getCropId, reqVO.getCropId()) .eqIfPresent(TaskDO::getCropNum, reqVO.getCropNum()) - .likeIfPresent(TaskDO::getName, reqVO.getName()) - .eqIfPresent(TaskDO::getContent, reqVO.getContent()) + .eqIfPresent(TaskDO::getTaskCateId, reqVO.getTaskCateId()) + .eqIfPresent(TaskDO::getTaskCateName, reqVO.getTaskCateName()) .eqIfPresent(TaskDO::getResources, reqVO.getResources()) .eqIfPresent(TaskDO::getImages, reqVO.getImages()) .betweenIfPresent(TaskDO::getPlanStartTime, reqVO.getBeginPlanStartTime(), reqVO.getEndPlanStartTime())