sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化任务

Browse Source
This commit is contained in:
小久哥
2022-05-31 16:05:50 +08:00
parent c55aa8f97a
commit d434b2084f
7 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java
+2 -5
View File
@@ -19,11 +19,8 @@ public class TaskBaseVO {
private Integer cropId; private Integer cropId;
private Integer cropNum; private Integer cropNum;
@ApiModelProperty(value = "") private Integer taskCateId;
private String name; private Integer taskCateName;
@ApiModelProperty(value = "")
private String content;
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private Object resources; private Object resources;
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java
+2 -5
View File
@@ -24,11 +24,8 @@ public class TaskExcelVO {
@ExcelProperty("") @ExcelProperty("")
private Integer cropNum; private Integer cropNum;
@ExcelProperty("") private Integer taskCateId;
private String name; private Integer taskCateName;
@ExcelProperty("")
private String content;
@ExcelProperty("") @ExcelProperty("")
private Object resources; private Object resources;
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java
+2 -5
View File
@@ -16,11 +16,8 @@ public class TaskExportReqVO {
private Integer cropId; private Integer cropId;
private Integer cropNum; private Integer cropNum;
@ApiModelProperty(value = "") private Integer taskCateId;
private String name; private Integer taskCateName;
@ApiModelProperty(value = "")
private String content;
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private Object resources; private Object resources;
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java
+2 -5
View File
@@ -18,11 +18,8 @@ public class TaskPageReqVO extends PageParam {
private Integer cropId; private Integer cropId;
private Integer cropNum; private Integer cropNum;
@ApiModelProperty(value = "") private Integer taskCateId;
private String name; private Integer taskCateName;
@ApiModelProperty(value = "")
private String content;
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private Object resources; private Object resources;
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java
+2 -5
View File
@@ -23,11 +23,8 @@ public class TaskPageSearchReqVO extends PageParam {
private Integer cropId; private Integer cropId;
private Integer cropNum; private Integer cropNum;
@ApiModelProperty(value = "") private Integer taskCateId;
private String name; private Integer taskCateName;
@ApiModelProperty(value = "")
private String content;
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private String resources; private String resources;
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java
+2 -8
View File
@@ -33,14 +33,8 @@ public class TaskDO extends BaseDO {
private Object executorPerson; private Object executorPerson;
private Integer workingHours; private Integer workingHours;
/** private Integer taskCateId;
* private Integer taskCateName;
*/
private String name;
/**
*
*/
private String content;
/** /**
* *
*/ */
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/task/TaskMapper.java
+4 -4
View File
@@ -22,8 +22,8 @@ public interface TaskMapper extends BaseMapperX<TaskDO> {
.eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId()) .eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId())
.eqIfPresent(TaskDO::getCropId, reqVO.getCropId()) .eqIfPresent(TaskDO::getCropId, reqVO.getCropId())
.eqIfPresent(TaskDO::getCropNum, reqVO.getCropNum()) .eqIfPresent(TaskDO::getCropNum, reqVO.getCropNum())
.likeIfPresent(TaskDO::getName, reqVO.getName()) .eqIfPresent(TaskDO::getTaskCateId, reqVO.getTaskCateId())
.eqIfPresent(TaskDO::getContent, reqVO.getContent()) .eqIfPresent(TaskDO::getTaskCateName, reqVO.getTaskCateName())
.eqIfPresent(TaskDO::getResources, reqVO.getResources()) .eqIfPresent(TaskDO::getResources, reqVO.getResources())
.eqIfPresent(TaskDO::getImages, reqVO.getImages()) .eqIfPresent(TaskDO::getImages, reqVO.getImages())
.betweenIfPresent(TaskDO::getPlanStartTime, reqVO.getBeginPlanStartTime(), reqVO.getEndPlanStartTime()) .betweenIfPresent(TaskDO::getPlanStartTime, reqVO.getBeginPlanStartTime(), reqVO.getEndPlanStartTime())
@@ -38,8 +38,8 @@ public interface TaskMapper extends BaseMapperX<TaskDO> {
.eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId()) .eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId())
.eqIfPresent(TaskDO::getCropId, reqVO.getCropId()) .eqIfPresent(TaskDO::getCropId, reqVO.getCropId())
.eqIfPresent(TaskDO::getCropNum, reqVO.getCropNum()) .eqIfPresent(TaskDO::getCropNum, reqVO.getCropNum())
.likeIfPresent(TaskDO::getName, reqVO.getName()) .eqIfPresent(TaskDO::getTaskCateId, reqVO.getTaskCateId())
.eqIfPresent(TaskDO::getContent, reqVO.getContent()) .eqIfPresent(TaskDO::getTaskCateName, reqVO.getTaskCateName())
.eqIfPresent(TaskDO::getResources, reqVO.getResources()) .eqIfPresent(TaskDO::getResources, reqVO.getResources())
.eqIfPresent(TaskDO::getImages, reqVO.getImages()) .eqIfPresent(TaskDO::getImages, reqVO.getImages())
.betweenIfPresent(TaskDO::getPlanStartTime, reqVO.getBeginPlanStartTime(), reqVO.getEndPlanStartTime()) .betweenIfPresent(TaskDO::getPlanStartTime, reqVO.getBeginPlanStartTime(), reqVO.getEndPlanStartTime())