优化任务

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;

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;

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;

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;

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;

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;
     /**
      * 
      */

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<TaskDO> {
                 .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<TaskDO> {
                 .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())