农场任务

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

@@ -15,6 +15,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class TaskBaseVO {
 
+    private Integer projectId;
+    private Integer cropId;
+    private Integer cropNum;
+
     @ApiModelProperty(value = "")
     private String name;
 

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

@@ -17,6 +17,13 @@ public class TaskExcelVO {
     @ExcelProperty("")
     private Long id;
 
+    @ExcelProperty("")
+    private Integer projectId;
+    @ExcelProperty("")
+    private Integer cropId;
+    @ExcelProperty("")
+    private Integer cropNum;
+
     @ExcelProperty("")
     private String name;
 

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

@@ -12,6 +12,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class TaskExportReqVO {
 
+    private Integer projectId;
+    private Integer cropId;
+    private Integer cropNum;
+
     @ApiModelProperty(value = "")
     private String name;
 

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

@@ -14,6 +14,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class TaskPageReqVO extends PageParam {
 
+    private Integer projectId;
+    private Integer cropId;
+    private Integer cropNum;
+
     @ApiModelProperty(value = "")
     private String name;
 

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

@@ -19,6 +19,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class TaskPageSearchReqVO extends PageParam {
 
+    private Integer projectId;
+    private Integer cropId;
+    private Integer cropNum;
+
     @ApiModelProperty(value = "")
     private String name;
 

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

@@ -24,6 +24,11 @@ public class TaskDO extends BaseDO {
      */
     @TableId
     private Long id;
+
+    private Integer projectId;
+    private Integer cropId;
+    private Integer cropNum;
+
     /**
      * 
      */

zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/task/TaskMapper.java

@@ -19,6 +19,9 @@ public interface TaskMapper extends BaseMapperX<TaskDO> {
 
     default PageResult<TaskDO> selectPage(TaskPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<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::getResources, reqVO.getResources())
@@ -32,6 +35,9 @@ public interface TaskMapper extends BaseMapperX<TaskDO> {
 
     default List<TaskDO> selectList(TaskExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<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::getResources, reqVO.getResources())