fix: 订单列表调整

admin/src/main/java/com/onsiteservice/admin/controller/category/ServiceCategoryController.java

@@ -70,4 +70,10 @@ public class ServiceCategoryController {
                                @CurrentUserId Long userId) {
         return success(serviceSubclassService.saveOrUpdate(subclass, userId));
     }
+
+    @ApiOperation(value = "获取可选小类", notes = "作者: 商天翔")
+    @GetMapping("/subclass-selectable")
+    public Result getSubClassSelectable() {
+        return success(serviceSubclassService.getSubClassSelectable());
+    }
 }

admin/src/main/java/com/onsiteservice/admin/controller/order/dto/OrderPageDTO.java

@@ -18,6 +18,8 @@ public class OrderPageDTO extends PageParams {
     @ApiModelProperty("客户服务手机号")
     private String phone;
 
+    private String userName;
+
     @ApiModelProperty("期望上门时间")
     private Date expectArrivalTimeBegin;
     private Date expectArrivalTimeEnd;

admin/src/main/java/com/onsiteservice/admin/service/category/ServiceSubclassService.java

 package com.onsiteservice.admin.service.category;
 
 import com.onsiteservice.dao.common.AbstractMapper;
+import com.onsiteservice.dao.mapper.service.ServiceCategoryMapper;
+import com.onsiteservice.dao.mapper.service.ServiceSubclassMapper;
 import com.onsiteservice.dao.util.EntityUtils;
+import com.onsiteservice.entity.category.ServiceCategory;
 import com.onsiteservice.entity.category.ServiceSubclass;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
 /**
  * @author 商天翔
  * @date 2022-07-13 17:03
@@ -15,6 +25,11 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(rollbackFor = Exception.class)
 public class ServiceSubclassService extends AbstractMapper<ServiceSubclass> {
 
+    @Resource
+    private ServiceSubclassMapper serviceSubclassMapper;
+    @Resource
+    private ServiceCategoryMapper serviceCategoryMapper;
+
     /**
      * 保存或更新方法
      */
@@ -29,4 +44,13 @@ public class ServiceSubclassService extends AbstractMapper<ServiceSubclass> {
     }
 
 
+    public List<Map> getSubClassSelectable() {
+        List<ServiceCategory> categories = serviceCategoryMapper.selectAll();
+        Map<Integer, String> categoryMap = categories.stream().collect(Collectors.toMap(ServiceCategory::getId, ServiceCategory::getServiceName));
+
+        List<ServiceSubclass> subclassList = serviceSubclassMapper.selectAll();
+        return subclassList.stream().sorted(Comparator.comparing(ServiceSubclass::getCategoryId))
+                .map(sub -> Map.of("value", sub.getId(), "label", categoryMap.get(sub.getCategoryId()) + "-" + sub.getServiceName()))
+                .collect(Collectors.toList());
+    }
 }

admin/src/main/resources/mapper/order/ServiceOrderBizMapper.xml

@@ -42,6 +42,9 @@
             <if test="param.address != null">
                 and t.address like  "%"#{param.address}"%"
             </if>
+            <if test="param.userName != null">
+                and t2.user_name like  "%"#{param.userName}"%"
+            </if>
         </where>
         order by
         <choose>