需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -215,6 +215,8 @@ public class OrderBaseLogic {
             orderStatusList.add(orderStatus);
             orderStatusList.add(OrderBaseStatusEnum.YJS.getKey());
             orderStatusList.add(OrderBaseStatusEnum.GCSZX.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.WDWG.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.YWGO.getKey());
         }else if(StringUtils.equals(orderStatus,OrderBaseStatusEnum.YCD.getKey())){
             //异常单，不能通过工单状态字段去查，所以这里留空
             orderStatusList.clear();

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -8,7 +8,7 @@
             count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG'),a.id,null)) 'fwz',
             count(DISTINCT if(a.is_exception=1,a.id,null)) 'ycd',
             count(DISTINCT if(a.order_status='DQD',a.id,null)) 'dqd',
-            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX'),a.id,null)) 'ywg',
+            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'ywg',
             count(DISTINCT if(a.over_time between date(now()) and now(),a.id,null)) 'jrwg',
             count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX'),a.id,null)) 'jbnwg',
             COUNT(DISTINCT a.id) AS 'all'

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

@@ -96,7 +96,7 @@ public class OrderBaseExcelLogic {
                 .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .in(adminUser.getType() == 0, AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
                 .eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
-                .list().stream().collect(Collectors.toMap(AdminWebsit::getName, Function.identity()));
+                .list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
         //已完工标识
         List<String> overOrderIds = new ArrayList<>();
         //旧工单id集
@@ -120,7 +120,7 @@ public class OrderBaseExcelLogic {
 
             String errPrefix = "第" + (index) + "行,工单号："+ row.get(1)+":";
             CommonUtils.initList(row, 100);
-            String websitName = row.get(0);
+            String websitId = row.get(0);
             String orderBaseId = row.get(1);
             String source = row.get(2);
             String orderSmallType = row.get(3);
@@ -145,7 +145,7 @@ public class OrderBaseExcelLogic {
 
             Boolean isQd = StringUtils.equals(isQdText, "是");
 
-            if (StringUtils.isAnyBlank(orderBaseId, source, orderSmallType, source, userName, linkName, userMobile, address, createTime)) {
+            if (StringUtils.isAnyBlank(orderBaseId, orderSmallType,orderChannel, userName, linkName, userMobile, address, createTime)) {
                 throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
             }
             if (userMobile.length() > 11) {
@@ -180,8 +180,8 @@ public class OrderBaseExcelLogic {
             }
 
             AdminWebsit adminWebsit = null;
-            if (StringUtils.isNotBlank(websitName)) {
-                adminWebsit = adminWebsitMap.get(websitName);
+            if (StringUtils.isNotBlank(websitId)) {
+                adminWebsit = adminWebsitMap.get(websitId);
                 if (adminWebsit == null) {
                     throw new RemoteServiceException(errPrefix + "网点名称不存在");
                 }
@@ -216,7 +216,7 @@ public class OrderBaseExcelLogic {
                 //如果已完工，师傅和网点不能为空
                 if (OrderBaseStatusEnum.isOver().contains(importBaseStatusEnum.getKey())) {
 
-                    if (StringUtils.isBlank(workerMobile) || StringUtils.isBlank(websitName)) {
+                    if (StringUtils.isBlank(workerMobile) || StringUtils.isBlank(websitId)) {
                         throw new RemoteServiceException(errPrefix + "完工状态师傅和网点不能为空");
                     }
                     overOrderIds.add(orderBaseId);