BJ_FS / urbanops

Commit bbee79c00b7c1e1597d829929b7f0db9252cc1bd

Authored by wangqian
1 parent beedfcc7

派单查询条件修改

Inline Side-by-side
Showing 7 changed files with 38 additions and 17 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java
  View file @bbee79c
... ... @@ -29,8 +29,15 @@ public class AssignTasksPageReqVO extends PageParam {
29 29 @Schema(description = "任务创建时间（派单时间）")
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31 31 private LocalDateTime[] createTime;
32   -
  32 + @Schema(description = "派单日期开始")
  33 + private String beginTime;
  34 + @Schema(description = "派单任务结束")
  35 + private String endTime;
  36 + @Schema(description = "任务截止时间开始")
33 37 private String deadlineBeginTime;
  38 + @Schema(description = "任务截止时间结束")
34 39 private String deadlineEndTime;
35 40  
  41 +
  42 +
36 43 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java
  View file @bbee79c
... ... @@ -10,6 +10,8 @@ import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.Ass
10 10 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoRespVO;
11 11 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO;
12 12 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoUpdReqVO;
  13 +import com.zteits.urbanops.module.garden.convert.AssignTaskConvert;
  14 +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
13 15 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
14 16 import com.zteits.urbanops.module.garden.service.assigntasks.AssignTasksService;
15 17 import com.zteits.urbanops.module.garden.service.assigntasksinfo.AssignTasksInfoService;
... ... @@ -80,9 +82,9 @@ public class AssignTasksInfoController {
80 82 @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
81 83 public CommonResult<AssignTasksInfoRespVO> getAssignTasksInfo(@RequestParam("id") Long id) {
82 84 AssignTasksInfoDO assignTasksInfo = assignTasksInfoService.getAssignTasksInfo(id);
83   -// AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
84   -// return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
85   - return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
  85 + AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
  86 + return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
  87 + //return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
86 88 }
87 89  
88 90 @GetMapping("/page")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java
  View file @bbee79c
... ... @@ -45,4 +45,12 @@ public class AssignTasksInfoPageReqVO extends PageParam {
45 45 @Schema(description = "是否打回0：正常 1：打回")
46 46 private Integer isReject;
47 47  
  48 + @Schema(description = "派单日期开始")
  49 + private String beginTime;
  50 + @Schema(description = "派单任务结束")
  51 + private String endTime;
  52 + @Schema(description = "任务截止时间开始")
  53 + private String deadlineBeginTime;
  54 + @Schema(description = "任务截止时间结束")
  55 + private String deadlineEndTime;
48 56 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java
  View file @bbee79c
... ... @@ -2,7 +2,8 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo;
2 2  
3 3 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
4 4 import cn.idev.excel.annotation.ExcelProperty;
5   -import com.fasterxml.jackson.annotation.JsonFormat;
  5 +import com.baomidou.mybatisplus.annotation.TableField;
  6 +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
6 7 import io.swagger.v3.oas.annotations.media.Schema;
7 8 import lombok.Data;
8 9  
... ... @@ -10,8 +11,6 @@ import java.time.LocalDateTime;
10 11 import java.util.Date;
11 12 import java.util.List;
12 13  
13   -import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
14   -
15 14 @Schema(description = "管理后台 - 派单任务-单位关联表（记录单位接收派单后的执行详情） Response VO")
16 15 @Data
17 16 @ExcelIgnoreUnannotated
... ... @@ -137,6 +136,7 @@ public class AssignTasksInfoRespVO {
137 136 break;
138 137 }
139 138 }
140   -
  139 + @TableField(typeHandler = JacksonTypeHandler.class)
  140 + private List templateFile;
141 141  
142 142 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AssignTaskConvert.java
  View file @bbee79c
... ... @@ -39,9 +39,7 @@ public interface AssignTaskConvert {
39 39 default AssignTasksInfoRespVO buildTask(AssignTasksInfoDO tasksInfoDO, AssignTasksDO tasksDO) {
40 40 AssignTasksInfoRespVO taskVO = BeanUtils.toBean(tasksInfoDO, AssignTasksInfoRespVO.class);
41 41 if (tasksDO != null) {
42   - taskVO.setTaskName(tasksDO.getTaskName());
43   - taskVO.setTaskType(tasksDO.getTaskType());
44   - taskVO.setDeadline(tasksDO.getDeadline());
  42 + taskVO.setTemplateFile(tasksDO.getTemplateFile());
45 43 }
46 44 return taskVO;
47 45 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java
  View file @bbee79c
... ... @@ -22,7 +22,11 @@ public interface AssignTasksMapper extends BaseMapperX&lt;AssignTasksDO&gt; {
22 22 .eqIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
23 23 .eqIfPresent(AssignTasksDO::getParentFinish, reqVO.getParentFinish())
24 24 .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getCreateTime())
25   - .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
  25 + //.betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
  26 + //.betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getBeginTime())
  27 + .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
  28 + .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadlineBeginTime(), reqVO.getDeadlineEndTime())
  29 +
26 30 .orderByDesc(AssignTasksDO::getId));
27 31 }
28 32  
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java
  View file @bbee79c
1 1 package com.zteits.urbanops.module.garden.dal.mysql.assigntasksinfo;
2 2  
3   -import java.util.*;
4   -
5 3 import com.zteits.urbanops.framework.common.pojo.PageResult;
6   -import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
7 4 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
  5 +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO;
8 7 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
9 8 import org.apache.ibatis.annotations.Mapper;
10   -import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.*;
11 9 import org.apache.ibatis.annotations.Param;
12 10  
  11 +import java.util.List;
  12 +
13 13 /**
14 14 * 派单任务-单位关联表（记录单位接收派单后的执行详情） Mapper
15 15 *
... ... @@ -27,7 +27,9 @@ public interface AssignTasksInfoMapper extends BaseMapperX&lt;AssignTasksInfoDO&gt; {
27 27 .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish())
28 28 .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue())
29 29 .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime())
30   - .betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadline())
  30 + //.betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadline())
  31 + .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
  32 + .betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadlineBeginTime(), reqVO.getDeadlineEndTime())
31 33 .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject())
32 34 .orderByDesc(AssignTasksInfoDO::getId));
33 35 }
... ...