fix: 客流平台使用的工单接口添加查询条件

src/main/java/vion/config/mp/MyBatisPlusConfig.java

@@ -29,6 +29,8 @@ public class MyBatisPlusConfig implements MetaObjectHandler {
             var vo = (UserVO) StpUtil.getTokenSession().get("curLoginUser");
             var vo = (UserVO) StpUtil.getTokenSession().get("curLoginUser");
             this.fillHasGetter(metaObject, "creator", vo.getUserid());
             this.fillHasGetter(metaObject, "creator", vo.getUserid());
             this.fillHasGetter(metaObject, "createBy", vo.getUserid());
             this.fillHasGetter(metaObject, "createBy", vo.getUserid());
+            this.fillHasGetter(metaObject, "updater", vo.getUserid());
+            this.fillHasGetter(metaObject, "updateBy", vo.getUserid());
         } catch (Exception ignored) {
         } catch (Exception ignored) {
         }
         }
     }
     }

src/main/java/vion/controller/ContractController.java

@@ -181,9 +181,9 @@ public class ContractController {
     @SaCheckPermission(value = "contract:CRMProduct", orRole = "admin")
     @SaCheckPermission(value = "contract:CRMProduct", orRole = "admin")
     public JsonNode getCRMProduct(@RequestParam String name,
     public JsonNode getCRMProduct(@RequestParam String name,
                                   @RequestParam String code,
                                   @RequestParam String code,
-                                  @RequestParam(defaultValue = "1") Integer page,
+                                  @RequestParam(defaultValue = "1") Integer pageNum,
                                   @RequestParam(defaultValue = "20") Integer pageSize) {
                                   @RequestParam(defaultValue = "20") Integer pageSize) {
-        return contractService.getCRMProduct(name, code, page, pageSize);
+        return contractService.getCRMProduct(name, code, pageNum, pageSize);
     }
     }
 
 
     @GetMapping("/contract/product")
     @GetMapping("/contract/product")

src/main/java/vion/controller/TaskTempController.java

@@ -5,13 +5,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.github.linpeilie.Converter;
 import io.github.linpeilie.Converter;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import vion.dto.TaskTempDTO;
 import vion.dto.TaskTempDTO;
 import vion.model.TaskTemp;
 import vion.model.TaskTemp;
 import vion.service.ITaskTempService;
 import vion.service.ITaskTempService;
 import vion.vo.TaskTempVO;
 import vion.vo.TaskTempVO;
 
 
-import java.util.List;
+import java.time.LocalDate;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
@@ -66,7 +67,13 @@ public class TaskTempController {
      * @return java.util.List<vion.vo.TaskTempVO>
      * @return java.util.List<vion.vo.TaskTempVO>
      */
      */
     @GetMapping("/keliu/taskTemp/{uuid}")
     @GetMapping("/keliu/taskTemp/{uuid}")
-    public List<TaskTempVO> getTaskTempByUuid(@PathVariable String uuid) {
-        return taskTempService.getTaskTempByUuid(uuid);
+    public Page<TaskTempVO> getTaskTempByUuid(@PathVariable String uuid,
+                                              @RequestParam(required = false) String storeName,
+                                              @RequestParam(required = false) Integer status,
+                                              @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
+                                              @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate,
+                                              @RequestParam(defaultValue = "1") Integer pageNum,
+                                              @RequestParam(defaultValue = "20") Integer pageSize) {
+        return taskTempService.getTaskTempByUuid(uuid, storeName, status, startDate, endDate, pageNum, pageSize);
     }
     }
 }
 }
\ No newline at end of file

src/main/java/vion/dto/TaskTempDTO.java

@@ -54,4 +54,8 @@ public class TaskTempDTO extends BaseDTO {
     private LocalDateTime startdate;
     private LocalDateTime startdate;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime enddate;
     private LocalDateTime enddate;
+    /**
+     * 客流平台直接提交的用户的uuid
+     */
+    private String userUid;
 }
 }

src/main/java/vion/interceptor/InterceptorConfig.java

@@ -34,6 +34,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/api/point/upd/{uuid}", "/api/point/get/{uuid}", "/api/point/install/submit/{uuid}", "/api/point/client/reject", "/api/point/reject/uuid/{uuid}")
                 .excludePathPatterns("/api/point/upd/{uuid}", "/api/point/get/{uuid}", "/api/point/install/submit/{uuid}", "/api/point/client/reject", "/api/point/reject/uuid/{uuid}")
                 .excludePathPatterns("/api/sparePart/frontSubmit", "/api/repairRec/frontSubmit")
                 .excludePathPatterns("/api/sparePart/frontSubmit", "/api/repairRec/frontSubmit")
                 .excludePathPatterns("/api/mqtt/**", "/api/monitor/**")
                 .excludePathPatterns("/api/mqtt/**", "/api/monitor/**")
-                .excludePathPatterns("/api/taskTemp/{uuid}", "/api/task/urge");
+                .excludePathPatterns("/api/keliu/taskTemp/{uuid}", "/api/keliu/task/urge");
     }
     }
 }
 }

src/main/java/vion/service/ITaskTempService.java

@@ -6,7 +6,7 @@ import vion.dto.TaskTempDTO;
 import vion.model.TaskTemp;
 import vion.model.TaskTemp;
 import vion.vo.TaskTempVO;
 import vion.vo.TaskTempVO;
 
 
-import java.util.List;
+import java.time.LocalDate;
 import java.util.Map;
 import java.util.Map;
 
 
 public interface ITaskTempService extends MPJBaseService<TaskTemp> {
 public interface ITaskTempService extends MPJBaseService<TaskTemp> {
@@ -19,5 +19,7 @@ public interface ITaskTempService extends MPJBaseService<TaskTemp> {
 
 
     Map<String, Long> getInfoByPhone(String phone);
     Map<String, Long> getInfoByPhone(String phone);
 
 
-    List<TaskTempVO> getTaskTempByUuid(String uuid);
+    Page<TaskTempVO> getTaskTempByUuid(String uuid, String storeName, Integer status,
+                                       LocalDate startDate, LocalDate endDate,
+                                       Integer pageNum, Integer pageSize);
 }
 }

src/main/java/vion/service/impl/ContractServiceImpl.java

@@ -567,7 +567,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
     }
     }
 
 
     @Override
     @Override
-    public JsonNode getCRMProduct(String name, String code, Integer page, Integer pageSize) {
+    public JsonNode getCRMProduct(String name, String code, Integer pageNum, Integer pageSize) {
         var conditions = JsonUtil.createArr().add(JsonUtil.createObj()
         var conditions = JsonUtil.createArr().add(JsonUtil.createObj()
                 .put("attr", "num_3")
                 .put("attr", "num_3")
                 .put("symbol", "noequal")
                 .put("symbol", "noequal")
@@ -586,7 +586,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
         }
         }
         var json = JsonUtil.createObj()
         var json = JsonUtil.createObj()
                 .put("corpid", "ding6bb660048f7ae2dcee0f45d8e4f7c288")
                 .put("corpid", "ding6bb660048f7ae2dcee0f45d8e4f7c288")
-                .put("page", page)
+                .put("page", pageNum)
                 .put("pageSize", pageSize)
                 .put("pageSize", pageSize)
                 .set("conditions", conditions);
                 .set("conditions", conditions);
 
 
@@ -602,7 +602,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
             return JsonUtil.createObj();
             return JsonUtil.createObj();
         }
         }
         return JsonUtil.createObj().putPOJO("records", jobj.path("result").withArray("list"))
         return JsonUtil.createObj().putPOJO("records", jobj.path("result").withArray("list"))
-                .put("current", page)
+                .put("current", pageNum)
                 .put("size", pageSize)
                 .put("size", pageSize)
                 .put("total", jobj.path("result").path("totalCount").asInt())
                 .put("total", jobj.path("result").path("totalCount").asInt())
                 .put("pages", jobj.path("result").path("totalPage").asInt());
                 .put("pages", jobj.path("result").path("totalPage").asInt());

src/main/java/vion/service/impl/TaskTempServiceImpl.java

@@ -35,9 +35,9 @@ import vion.vo.TaskTempVO;
 
 
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -152,14 +152,19 @@ public class TaskTempServiceImpl extends MPJBaseServiceImpl<TaskTempMapper, Task
     }
     }
 
 
     @Override
     @Override
-    public List<TaskTempVO> getTaskTempByUuid(String uuid) {
+    public Page<TaskTempVO> getTaskTempByUuid(String uuid, String storeName, Integer status,
+                                              LocalDate startDate, LocalDate endDate,
+                                              Integer pageNum, Integer pageSize) {
         var wrapper = new MPJLambdaWrapper<TaskTemp>()
         var wrapper = new MPJLambdaWrapper<TaskTemp>()
                 .selectAll(TaskTemp.class)
                 .selectAll(TaskTemp.class)
                 .selectAssociation(Task.class, TaskTempVO::getTask)
                 .selectAssociation(Task.class, TaskTempVO::getTask)
                 .leftJoin(Task.class, Task::getTaskTempId, TaskTemp::getId)
                 .leftJoin(Task.class, Task::getTaskTempId, TaskTemp::getId)
                 .eq(TaskTemp::getUserUid, uuid)
                 .eq(TaskTemp::getUserUid, uuid)
+                .like(StrUtil.isNotBlank(storeName), TaskTemp::getStoreName, storeName)
+                .between(ArrayUtil.isAllNotNull(startDate, endDate), TaskTemp::getRepairTime, startDate, endDate)
+                .eq(ObjUtil.isNotNull(status), Task::getStatus, status)
                 .orderByDesc(TaskTemp::getRepairTime);
                 .orderByDesc(TaskTemp::getRepairTime);
-        return this.selectJoinList(TaskTempVO.class, wrapper);
+        return this.selectJoinListPage(Page.of(pageNum, pageSize), TaskTempVO.class, wrapper);
     }
     }
 
 
     String buildMsg(String userid, TaskTemp taskTemp) {
     String buildMsg(String userid, TaskTemp taskTemp) {

src/main/java/vion/vo/TaskTempVO.java

@@ -65,4 +65,8 @@ public class TaskTempVO {
      * 邮箱地址
      * 邮箱地址
      */
      */
     private String email;
     private String email;
+    /**
+     * 客流平台直接提交的用户的uuid
+     */
+    private String userUid;
 }
 }