农场任务

This commit is contained in:
小久哥
2022-05-27 17:27:38 +08:00
parent 1273f011b4
commit 9f394d71a1
7 changed files with 34 additions and 0 deletions
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -24,6 +24,11 @@ public class TaskDO extends BaseDO {
*/
@TableId
private Long id;
private Integer projectId;
private Integer cropId;
private Integer cropNum;
/**
*
*/
@@ -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())