需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WebsitDispatchRe.java

@@ -0,0 +1,38 @@
+package com.gree.mall.manager.bean.workorder;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class WebsitDispatchRe {
+
+
+    @ApiModelProperty(value = "省id")
+    private String provinceCode;
+
+    @ApiModelProperty(value = "城市id")
+    private String cityCode;
+
+    @ApiModelProperty(value = "区域id")
+    private String areaCode;
+
+    @ApiModelProperty(value = "街道id")
+    private String streetCode;
+
+    @ApiModelProperty(value = "工单渠道id")
+    private List<String> dictCode;
+
+    @ApiModelProperty(value = "工单类型id")
+    private List<String> orderSmallId;
+
+    @ApiModelProperty(value = "产品大类id")
+    private List<String> categoryId;
+
+    @ApiModelProperty(value = "工单来源id")
+    private List<String> orderSourceId;
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/workorder/IncreMapper.java

@@ -31,10 +31,10 @@ public interface IncreMapper {
                                @Param("cityCode") String cityCode,
                                @Param("areaCode") String areaCode,
                                @Param("streetCode") String streetCode,
-                               @Param("dictCode") String dictCode,
-                               @Param("orderSmallId") String orderSmallId,
-                               @Param("categoryId") String categoryId,
-                               @Param("orderSourceId") String orderSourceId,
+                               @Param("dictCode") List<String> dictCode,
+                               @Param("orderSmallId") List<String> orderSmallId,
+                               @Param("categoryId") List<String> categoryId,
+                               @Param("orderSourceId") List<String> orderSourceId,
                                 @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     @SqlParser(filter = true)
@@ -43,10 +43,10 @@ public interface IncreMapper {
             @Param("cityCode") String cityCode,
             @Param("areaCode") String areaCode,
             @Param("streetCode") String streetCode,
-            @Param("dictCode") String dictCode,
-            @Param("orderSmallId") String orderSmallId,
-            @Param("categoryId") String categoryId,
-            @Param("orderSourceId") String orderSourceId,
+            @Param("dictCode") List<String> dictCode,
+            @Param("orderSmallId") List<String> orderSmallId,
+            @Param("categoryId") List<String> categoryId,
+            @Param("orderSourceId") List<String> orderSourceId,
             @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     @SqlParser(filter = true)
@@ -54,10 +54,10 @@ public interface IncreMapper {
                                  @Param("cityCode") String cityCode,
                                  @Param("areaCode") String areaCode,
                                  @Param("streetCode") String streetCode,
-                                 @Param("dictCode") String dictCode,
-                                 @Param("orderSmallId") String orderSmallId,
-                                 @Param("categoryId") String categoryId,
-                                 @Param("orderSourceId") String orderSourceId,
+                                 @Param("dictCode") List<String> dictCode,
+                                 @Param("orderSmallId") List<String> orderSmallId,
+                                 @Param("categoryId") List<String> categoryId,
+                                 @Param("orderSourceId") List<String> orderSourceId,
                                  @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     @SqlParser(filter = true)
@@ -65,10 +65,10 @@ public interface IncreMapper {
                                @Param("cityCode") String cityCode,
                                @Param("areaCode") String areaCode,
                                @Param("streetCode") String streetCode,
-                               @Param("dictCode") String dictCode,
-                               @Param("orderSmallId") String orderSmallId,
-                               @Param("categoryId") String categoryId,
-                               @Param("orderSourceId") String orderSourceId,
+                               @Param("dictCode") List<String> dictCode,
+                               @Param("orderSmallId") List<String> orderSmallId,
+                               @Param("categoryId") List<String> categoryId,
+                               @Param("orderSourceId") List<String> orderSourceId,
                                @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     @SqlParser(filter = true)
@@ -77,10 +77,10 @@ public interface IncreMapper {
             @Param("cityCode") String cityCode,
             @Param("areaCode") String areaCode,
             @Param("streetCode") String streetCode,
-            @Param("dictCode") String dictCode,
-            @Param("orderSmallId") String orderSmallId,
-            @Param("categoryId") String categoryId,
-            @Param("orderSourceId") String orderSourceId,
+            @Param("dictCode") List<String> dictCode,
+            @Param("orderSmallId") List<String> orderSmallId,
+            @Param("categoryId") List<String> categoryId,
+            @Param("orderSourceId") List<String> orderSourceId,
             @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     @SqlParser(filter = true)
@@ -88,10 +88,10 @@ public interface IncreMapper {
                                      @Param("cityCode") String cityCode,
                                      @Param("areaCode") String areaCode,
                                      @Param("streetCode") String streetCode,
-                                     @Param("dictCode") String dictCode,
-                                     @Param("orderSmallId") String orderSmallId,
-                                     @Param("categoryId") String categoryId,
-                                     @Param("orderSourceId") String orderSourceId,
+                                     @Param("dictCode") List<String> dictCode,
+                                     @Param("orderSmallId") List<String> orderSmallId,
+                                     @Param("categoryId") List<String> categoryId,
+                                     @Param("orderSourceId") List<String> orderSourceId,
                                      @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     @SqlParser(filter = true)
@@ -99,10 +99,10 @@ public interface IncreMapper {
                                        @Param("cityCode") String cityCode,
                                        @Param("areaCode") String areaCode,
                                        @Param("streetCode") String streetCode,
-                                       @Param("dictCode") String dictCode,
-                                       @Param("orderSmallId") String orderSmallId,
-                                       @Param("categoryId") String categoryId,
-                                       @Param("orderSourceId") String orderSourceId,
+                                       @Param("dictCode") List<String> dictCode,
+                                       @Param("orderSmallId") List<String> orderSmallId,
+                                       @Param("categoryId") List<String> categoryId,
+                                       @Param("orderSourceId") List<String> orderSourceId,
                                        @Param("adminCompanyIds") List<String> adminCompanyIds);
 
     @SqlParser(filter = true)
@@ -111,9 +111,9 @@ public interface IncreMapper {
             @Param("cityCode") String cityCode,
             @Param("areaCode") String areaCode,
             @Param("streetCode") String streetCode,
-            @Param("dictCode") String dictCode,
-            @Param("orderSmallId") String orderSmallId,
-            @Param("categoryId") String categoryId,
-            @Param("orderSourceId") String orderSourceId,
+            @Param("dictCode") List<String> dictCode,
+            @Param("orderSmallId") List<String> orderSmallId,
+            @Param("categoryId") List<String> categoryId,
+            @Param("orderSourceId") List<String> orderSourceId,
             @Param("adminCompanyIds") List<String> adminCompanyIds);
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/DispatchController.java

@@ -109,6 +109,14 @@ public class DispatchController {
     }
 
 
+    @PostMapping("/detailDispatch")
+    @ApiOperation(value = "自动派工街道配置-详情")
+    public ResponseHelper<WebsitDispatch> detailDispatch(@ApiParam(value = "id", required = false) @RequestParam String id) {
+        WebsitDispatch websitDispatch = changeOrderLogic.detailDispatch(id);
+        return ResponseHelper.success(websitDispatch);
+    }
+
+
     @PostMapping("/delDispatch")
     @ApiOperation(value = "自动派工街道配置-删除")
     public ResponseHelper delDispatch(@ApiParam(value = "id", required = false) @RequestParam List<String> id) {
@@ -134,125 +142,97 @@ public class DispatchController {
     @PostMapping("/pList")
     @ApiOperation(value = "省")
     public ResponseHelper<List<DispatchCherVO>> pList(
-            @ApiParam(value = "省id", required = false) @RequestParam String pId,
-            @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-            @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-            @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-            @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-            @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-            @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-            @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId
+            @RequestBody WebsitDispatchRe websitDispatchRe
 
     ) {
-        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.pList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.pList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
 
     @PostMapping("/cList")
     @ApiOperation(value = "市")
     public ResponseHelper<List<DispatchCherVO>> cList(
-            @ApiParam(value = "省id", required = false) @RequestParam String pId,
-            @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-            @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-            @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-            @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-            @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-            @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-            @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId
+            @RequestBody WebsitDispatchRe websitDispatchRe
+
     ) {
-        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.cList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.cList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
 
     @PostMapping("/aList")
     @ApiOperation(value = "区")
-    public ResponseHelper<List<DispatchCherVO>> aList(@ApiParam(value = "省id", required = false) @RequestParam String pId,
-                                @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-                                @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-                                @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-                                @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-                                @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-                                @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-                                @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId) {
-        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.aList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+    public ResponseHelper<List<DispatchCherVO>> aList(
+            @RequestBody WebsitDispatchRe websitDispatchRe
+
+    ) {
+        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.aList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
 
     @PostMapping("/sList")
     @ApiOperation(value = "街道")
     public ResponseHelper<List<DispatchCherVO>> sList(
-            @ApiParam(value = "省id", required = false) @RequestParam String pId,
-            @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-            @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-            @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-            @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-            @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-            @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-            @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId
+            @RequestBody WebsitDispatchRe websitDispatchRe
     ) {
-        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.sList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.sList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
 
 
     @PostMapping("/channel")
     @ApiOperation(value = "工单渠道")
-    public ResponseHelper<List<DispatchCherVO>> channel(    @ApiParam(value = "省id", required = false) @RequestParam String pId,
-                                   @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-                                   @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-                                   @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-                                   @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-                                   @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-                                   @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-                                   @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId) {
-        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.channel(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+    public ResponseHelper<List<DispatchCherVO>> channel(
+            @RequestBody WebsitDispatchRe websitDispatchRe
+    ) {
+        List<DispatchCherVO> dispatchCherVOS = changeOrderLogic.channel(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
 
         return ResponseHelper.success(dispatchCherVOS);
     }
 
     @PostMapping("/smallList")
     @ApiOperation(value = "工单类型")
-    public ResponseHelper<List<DispatchCherVO>> smallList(@ApiParam(value = "省id", required = false) @RequestParam String pId,
-                                    @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-                                    @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-                                    @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-                                    @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-                                    @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-                                    @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-                                    @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId) {
+    public ResponseHelper<List<DispatchCherVO>> smallList(
+            @RequestBody WebsitDispatchRe websitDispatchRe
+    ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic
-                .smallList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+                .smallList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                        websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                        websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
 
         return ResponseHelper.success(dispatchCherVOS);
     }
 
     @PostMapping("/categoryList")
     @ApiOperation(value = "产品大类")
-    public ResponseHelper<List<DispatchCherVO>> categoryList(@ApiParam(value = "省id", required = false) @RequestParam String pId,
-                                       @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-                                       @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-                                       @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-                                       @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-                                       @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-                                       @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-                                       @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId) {
+    public ResponseHelper<List<DispatchCherVO>> categoryList(
+            @RequestBody WebsitDispatchRe websitDispatchRe
+    ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic
-                .categoryList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+                .categoryList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                        websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                        websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
 
     @PostMapping("/sourceList")
     @ApiOperation(value = "工单来源")
-    public ResponseHelper sourceList(@ApiParam(value = "省id", required = false) @RequestParam String pId,
-                                     @ApiParam(value = "市id", required = false) @RequestParam String cityCode,
-                                     @ApiParam(value = "区id", required = false) @RequestParam String areaCode,
-                                     @ApiParam(value = "街道id", required = false) @RequestParam String streetCode,
-                                     @ApiParam(value = "工单渠道id", required = false) @RequestParam String dictCode,
-                                     @ApiParam(value = "工单类型id", required = false) @RequestParam String orderSmallId,
-                                     @ApiParam(value = "产品大类id", required = false) @RequestParam String categoryId,
-                                     @ApiParam(value = "工单来源id", required = false) @RequestParam String orderSourceId) {
+    public ResponseHelper sourceList(
+            @RequestBody WebsitDispatchRe websitDispatchRe
+    ) {
         List<DispatchCherVO> dispatchCherVOS = changeOrderLogic
-                .sourceList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId);
+                .sourceList(websitDispatchRe.getProvinceCode(), websitDispatchRe.getCityCode(),
+                        websitDispatchRe.getAreaCode(), websitDispatchRe.getProvinceCode(), websitDispatchRe.getDictCode(), websitDispatchRe.getOrderSmallId(),
+                        websitDispatchRe.getCategoryId(), websitDispatchRe.getOrderSmallId());
         return ResponseHelper.success(dispatchCherVOS);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -298,7 +298,7 @@ public class ChangeOrderLogic {
         return websitDispatchVOIPage;
     }
 
-    public List<DispatchCherVO> pList(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> pList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
@@ -306,49 +306,49 @@ public class ChangeOrderLogic {
         return increMapper.pList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
     }
 
-    public List<DispatchCherVO> cList(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> cList(String pId, String cityCode, String areaCode, String streetCode,List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
         return increMapper.cList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
     }
 
-    public List<DispatchCherVO> aList(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> aList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
         return increMapper.aList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
     }
 
-    public List<DispatchCherVO> sList(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> sList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
         return increMapper.sList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
     }
 
-    public List<DispatchCherVO> channel(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> channel(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
         return increMapper.channel(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
     }
 
-    public List<DispatchCherVO> smallList(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> smallList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
         return increMapper.smallList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
     }
 
-    public List<DispatchCherVO> categoryList(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> categoryList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
         return increMapper.categoryList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
     }
 
-    public List<DispatchCherVO> sourceList(String pId, String cityCode, String areaCode, String streetCode, String dictCode, String orderSmallId, String categoryId, String orderSourceId) {
+    public List<DispatchCherVO> sourceList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
@@ -547,4 +547,9 @@ public class ChangeOrderLogic {
         websitDispatch.updateById();
 
     }
+
+    public WebsitDispatch detailDispatch(String id) {
+
+        return websitDispatchService.getById(id);
+    }
 }

mall-server-api/src/main/resources/mapper/workorder/IncreMapper.xml

@@ -141,17 +141,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
      group by a.province_code
@@ -207,17 +219,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
         group by a.city_code
@@ -273,17 +297,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
         group by a.area_code
@@ -339,17 +375,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
         group by a.id
@@ -405,17 +453,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
         group by b.dict_code
@@ -471,17 +531,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
         group by c.id
@@ -537,17 +609,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
         group by d.category_id
@@ -603,17 +687,29 @@
         <if test="streetCode != null and streetCode !=''">
             AND a.id ==  #{streetCode}
         </if>
-        <if test="dictCode != null and dictCode !=''">
-            AND b.dict_code == #{dictCode}
+        <if test="dictCode != null and dictCode.size > 0">
+            AND b.dict_code IN
+            <foreach item="item" index="index" collection="dictCode" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSmallId != null and orderSmallId !=''">
-            AND c.id== #{orderSmallId}
+        <if test="orderSmallId != null and orderSmallId.size > 0">
+            AND c.id in
+            <foreach item="item" index="index" collection="orderSmallId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="categoryId != null and categoryId !=''">
-            AND d.category_id == #{categoryId}
+        <if test="categoryId != null and categoryId.size > 0">
+            AND d.category_id in
+            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="orderSourceId != null and orderSourceId !=''">
-            AND e.dict_code == #{orderSourceId}
+        <if test="orderSourceId != null and orderSourceId.size > 0">
+            AND e.dict_code in
+            <foreach item="item" index="index" collection="orderSourceId" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
 
         group by  e.dict_code