派单查询条件修改

wangqian
1 parent beedfcc7
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
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AssignTaskConvert.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java
@@ -29,8 +29,15 @@ public class AssignTasksPageReqVO extends PageParam {
     @Schema(description = "任务创建时间（派单时间）")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "派单日期开始")
+    private String beginTime;
+    @Schema(description = "派单任务结束")
+    private String endTime;
+    @Schema(description = "任务截止时间开始")
     private String deadlineBeginTime;
+    @Schema(description = "任务截止时间结束")
     private String deadlineEndTime;
+
+
 }
@@ -10,6 +10,8 @@ import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.Ass
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoRespVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoUpdReqVO;
+import com.zteits.urbanops.module.garden.convert.AssignTaskConvert;
+import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
 import com.zteits.urbanops.module.garden.service.assigntasks.AssignTasksService;
 import com.zteits.urbanops.module.garden.service.assigntasksinfo.AssignTasksInfoService;
@@ -80,9 +82,9 @@ public class AssignTasksInfoController {
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<AssignTasksInfoRespVO> getAssignTasksInfo(@RequestParam("id") Long id) {
         AssignTasksInfoDO assignTasksInfo = assignTasksInfoService.getAssignTasksInfo(id);
-//        AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
-//        return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
-        return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
+        AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
+        return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
+        //return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
     }
     @GetMapping("/page")
@@ -45,4 +45,12 @@ public class AssignTasksInfoPageReqVO extends PageParam {
     @Schema(description = "是否打回0：正常 1：打回")
     private Integer isReject;
+    @Schema(description = "派单日期开始")
+    private String beginTime;
+    @Schema(description = "派单任务结束")
+    private String endTime;
+    @Schema(description = "任务截止时间开始")
+    private String deadlineBeginTime;
+    @Schema(description = "任务截止时间结束")
+    private String deadlineEndTime;
 }
@@ -2,7 +2,8 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -10,8 +11,6 @@ import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
-import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
 @Schema(description = "管理后台 - 派单任务-单位关联表（记录单位接收派单后的执行详情） Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -137,6 +136,7 @@ public class AssignTasksInfoRespVO {
                 break;
         }
     }
-
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List templateFile;
 }
@@ -39,9 +39,7 @@ public interface AssignTaskConvert {
     default AssignTasksInfoRespVO buildTask(AssignTasksInfoDO tasksInfoDO, AssignTasksDO tasksDO) {
         AssignTasksInfoRespVO taskVO = BeanUtils.toBean(tasksInfoDO, AssignTasksInfoRespVO.class);
         if (tasksDO != null) {
-            taskVO.setTaskName(tasksDO.getTaskName());
-            taskVO.setTaskType(tasksDO.getTaskType());
-            taskVO.setDeadline(tasksDO.getDeadline());
+            taskVO.setTemplateFile(tasksDO.getTemplateFile());
         }
         return taskVO;
     }
@@ -22,7 +22,11 @@ public interface AssignTasksMapper extends BaseMapperX&lt;AssignTasksDO&gt; {
                 .eqIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
                 .eqIfPresent(AssignTasksDO::getParentFinish, reqVO.getParentFinish())
                 .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getCreateTime())
-                .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
+                //.betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
+                //.betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getBeginTime())
+                .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
+                .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadlineBeginTime(), reqVO.getDeadlineEndTime())
+
                 .orderByDesc(AssignTasksDO::getId));
     }
 package com.zteits.urbanops.module.garden.dal.mysql.assigntasksinfo;
-import java.util.*;
-
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.*;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
 /**
  * 派单任务-单位关联表（记录单位接收派单后的执行详情） Mapper
  *
@@ -27,7 +27,9 @@ public interface AssignTasksInfoMapper extends BaseMapperX&lt;AssignTasksInfoDO&gt; {
                 .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish())
                 .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue())
                 .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime())
-                .betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadline())
+               //.betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadline())
+                .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
+                .betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadlineBeginTime(), reqVO.getDeadlineEndTime())
                 .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject())
                 .orderByDesc(AssignTasksInfoDO::getId));
     }