From e9fe435aef1b32bfabdbb1545549c657a6c0d7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com> Date: Thu, 23 Jun 2022 15:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/task/TaskController.java | 8 --- .../admin/task/vo/TaskPageReqVO.java | 9 +++ .../admin/task/vo/TaskPageSearchReqVO.java | 8 ++- .../admin/task/vo/TaskSearchVO.java | 69 +++++++++++++++++++ .../farm/dal/mysql/task/TaskMapper.java | 27 ++++++-- .../module/farm/service/task/TaskService.java | 8 --- .../farm/service/task/TaskServiceImpl.java | 12 +--- .../main/resources/mapper/task/TaskMapper.xml | 26 ------- 8 files changed, 107 insertions(+), 60 deletions(-) create mode 100644 zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskSearchVO.java diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/TaskController.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/TaskController.java index a084b3ec..389cf07f 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/TaskController.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/TaskController.java @@ -106,14 +106,6 @@ public class TaskController { return success(pageResult); } - @GetMapping("/pageSearch") - @ApiOperation("搜索条件获得农场项目分页") - public CommonResult> getTaskSearchPage(@Valid TaskPageSearchReqVO pageVO) { - PageResult pageResult = taskService.getTaskSearchPage(pageVO); - return success(TaskConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/export-excel") @ApiOperation("导出农场项目 Excel") @PreAuthorize("@ss.hasPermission('farm:task:export')") 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 3795a2fd..86f27087 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 @@ -74,4 +74,13 @@ public class TaskPageReqVO extends PageParam { private Boolean myTask; + @ApiModelProperty("后台搜索区域子id") + private Long areaId; + + @ApiModelProperty("后台搜索资源id") + private Long resourceId; + + @ApiModelProperty("后台搜索执行人") + private Long executorName; + } 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 69b19c16..7ba42508 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 @@ -33,8 +33,6 @@ public class TaskPageSearchReqVO extends PageParam { @ApiModelProperty("子区域列表") private List areas; - - private Long mainPerson; private JSONArray executorPerson; private Integer workingHours; @@ -72,4 +70,10 @@ public class TaskPageSearchReqVO extends PageParam { @ApiModelProperty("草稿") private Boolean draft; + + //后台条件查询 + private String projectName; + + private Long areaSonId; + } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskSearchVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskSearchVO.java new file mode 100644 index 00000000..5a0911e6 --- /dev/null +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskSearchVO.java @@ -0,0 +1,69 @@ +package cn.iocoder.yudao.module.farm.controller.admin.task.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import com.alibaba.fastjson.JSONArray; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@ApiModel("管理后台 - 农场项目分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class TaskSearchVO extends PageParam { + + + @ApiModelProperty("草稿") + private Boolean draft = false; + + @ApiModelProperty("项目名") + private String projectId; + + @ApiModelProperty("区域名") + private String areaId; + + @ApiModelProperty("任务父级名") + private Long taskCateId; + + @ApiModelProperty("任务子级名") + private Long taskCateName; + + @ApiModelProperty("资源名") + private Long resourceId; + + @ApiModelProperty(value = "优先级") + private Integer weight; + + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @ApiModelProperty(value = "开始") + private LocalDateTime beginPlanStartTime; + + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @ApiModelProperty(value = "结束") + private LocalDateTime endPlanStartTime; + + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @ApiModelProperty(value = "开始") + private LocalDateTime beginPlanEndTime; + + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @ApiModelProperty(value = "结束") + private LocalDateTime endPlanEndTime; + + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @ApiModelProperty(value = "开始") + private LocalDateTime beginCreateTime; + + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + @ApiModelProperty(value = "结束") + private LocalDateTime endCreateTime; + +} 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 b316e946..6cf39801 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 @@ -2,10 +2,12 @@ package cn.iocoder.yudao.module.farm.dal.mysql.task; import java.util.*; +import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.farm.dal.dataobject.task.TaskDO; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.farm.controller.admin.task.vo.*; @@ -18,8 +20,22 @@ import cn.iocoder.yudao.module.farm.controller.admin.task.vo.*; public interface TaskMapper extends BaseMapperX { default PageResult selectPage(TaskPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId()) + LambdaQueryWrapperX lambdaQueryWrapperX = new LambdaQueryWrapperX(); + + //搜索区域 + if (ObjectUtil.isNotEmpty(reqVO.getAreaId())){ + lambdaQueryWrapperX.apply("JSON_CONTAINS(areas, '"+ reqVO.getAreaId()+"')"); + } + //搜索资源 + if (ObjectUtil.isNotEmpty(reqVO.getResourceId())){ + lambdaQueryWrapperX.apply("JSON_CONTAINS(resources, JSON_OBJECT('resourceId'," +reqVO.getResourceId()+"))"); + } + //搜索执行人 + if (ObjectUtil.isNotEmpty(reqVO.getExecutorName())){ + lambdaQueryWrapperX.apply("JSON_CONTAINS(executor_person, '"+ reqVO.getExecutorName()+"')"); + } + + lambdaQueryWrapperX.eqIfPresent(TaskDO::getProjectId, reqVO.getProjectId()) .eqIfPresent(TaskDO::getCropId, reqVO.getCropId()) .eqIfPresent(TaskDO::getCropNum, reqVO.getCropNum()) .eqIfPresent(TaskDO::getTaskCateId, reqVO.getTaskCateId()) @@ -32,7 +48,10 @@ public interface TaskMapper extends BaseMapperX { .eqIfPresent(TaskDO::getWeight, reqVO.getWeight()) .betweenIfPresent(TaskDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) .eqIfPresent(TaskDO::getPretendDelete, reqVO.getPretendDelete()) - .orderByDesc(TaskDO::getId)); + .eqIfPresent(TaskDO::getMainPerson, reqVO.getMainPerson()) + .orderByDesc(TaskDO::getId); + + return selectPage(reqVO, lambdaQueryWrapperX); } default List selectList(TaskExportReqVO reqVO) { @@ -53,6 +72,4 @@ public interface TaskMapper extends BaseMapperX { .orderByDesc(TaskDO::getId)); } - List getTaskSearchPage(TaskPageSearchReqVO reqVO); - } diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskService.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskService.java index 63eb2177..b3a2b49d 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskService.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskService.java @@ -65,14 +65,6 @@ public interface TaskService { PageResult getAdminTaskPage(TaskPageReqVO pageReqVO); - /** - * 搜索条件获得农场项目分页 - * - * @param pageReqVO 分页查询 - * @return 农场项目分页 - */ - PageResult getTaskSearchPage(TaskPageSearchReqVO pageReqVO); - /** * 获得农场项目列表, 用于 Excel 导出 * diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java index 04af8861..6ff35c3e 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/task/TaskServiceImpl.java @@ -41,6 +41,7 @@ import com.zsw.base.R; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import java.util.*; @@ -216,17 +217,6 @@ public class TaskServiceImpl implements TaskService { return page; } - @Override - public PageResult getTaskSearchPage(TaskPageSearchReqVO pageVO){ - pageVO.setPageNo(pageVO.getPageNo() - 1); - List list = taskMapper.getTaskSearchPage(pageVO); - PageResult result = new PageResult<>(); - result.setList(list); - result.setTotal(Long.valueOf(list.size())); - return result; - - } - @Override public List getTaskList(TaskExportReqVO exportReqVO) { return taskMapper.selectList(exportReqVO); diff --git a/zsw-farm/zsw-farm-impl/src/main/resources/mapper/task/TaskMapper.xml b/zsw-farm/zsw-farm-impl/src/main/resources/mapper/task/TaskMapper.xml index 1d477e19..09f6d581 100644 --- a/zsw-farm/zsw-farm-impl/src/main/resources/mapper/task/TaskMapper.xml +++ b/zsw-farm/zsw-farm-impl/src/main/resources/mapper/task/TaskMapper.xml @@ -9,31 +9,5 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> -