lyhzzz 2 years ago
parent
commit
705af6c0d9

+ 5 - 5
src/main/java/com/fdkankan/sale/common/RepairStatusProcessComing.java

@@ -14,14 +14,14 @@ public enum RepairStatusProcessComing {
     TO_BE_CHECK(10, "待检测","维修检测","{userName}检测中","repairMan"),
     TO_BE_CHECK(10, "待检测","维修检测","{userName}检测中","repairMan"),
     TO_BE_QUOTED(20, "待报价","维修报价","{userName}费用确认中","sale"),
     TO_BE_QUOTED(20, "待报价","维修报价","{userName}费用确认中","sale"),
     TO_BE_CONFIRMED(30,"待确认", "维修确认","待确认报价",""),
     TO_BE_CONFIRMED(30,"待确认", "维修确认","待确认报价",""),
-    TO_BE_CANCELED(40, "已取消","维修支付","待支付费用",""),
+    TO_BE_CANCELED(40, "已取消","维修支付","待支付费用","sale"),
     TO_BE_PREPARED(50,"待备料","备件准备", "{userName}正在准备所需备件","repairSupply"),
     TO_BE_PREPARED(50,"待备料","备件准备", "{userName}正在准备所需备件","repairSupply"),
     TO_BE_REPAIRED(60, "维修中","设备维修","{userName}维修中","repairMan"),
     TO_BE_REPAIRED(60, "维修中","设备维修","{userName}维修中","repairMan"),
     TO_BE_TESTED(70, "待测试","维修测试","{userName}正在测试","tester"),
     TO_BE_TESTED(70, "待测试","维修测试","{userName}正在测试","tester"),
-    TO_BE_PAID(80, "待支付","维修支付","待支付费用",""),
-    TO_BE_RECOVERED(90, "待回收","备件回收","待回收备件",""),
-    TO_BE_CANCELED_RECOVERED(91,"取消维修备件回收","备件回收", "待回收备件",""),
-    TO_BE_SHIPPED(100, "待发货","维修完毕","待取回/寄回设备",""),
+    TO_BE_PAID(80, "待支付","维修支付","待支付费用","sale"),
+    TO_BE_RECOVERED(90, "待回收","备件回收","待回收备件","repairSupply"),
+    TO_BE_CANCELED_RECOVERED(91,"取消维修备件回收","备件回收", "待回收备件","repairSupply"),
+    TO_BE_SHIPPED(100, "待发货","维修完毕","待取回/寄回设备","sale"),
     OVER_SHIPPED(110, "已发货","维修完毕","{userName}已完成发货","sale"),
     OVER_SHIPPED(110, "已发货","维修完毕","{userName}已完成发货","sale"),
     ;
     ;
 
 

+ 8 - 0
src/main/java/com/fdkankan/sale/service/impl/DingService.java

@@ -115,6 +115,14 @@ public class DingService {
                     }
                     }
                 }
                 }
             }
             }
+            if(repairLog.getRepairStatus().equals(RepairStatusProcessComing.TO_BE_RECEIVED.getStatus())){
+                List<SysUser> userList = sysUserService.getByRoleType(2);
+                for (SysUser user : userList) {
+                    if(StringUtils.isNotBlank(user.getDingAccount())){
+                        phones.add(user.getDingAccount());
+                    }
+                }
+            }
             if(phones.size() <=0){
             if(phones.size() <=0){
                 throw new BusinessException(ResultCode.DING_SEND_ERROR);
                 throw new BusinessException(ResultCode.DING_SEND_ERROR);
             }
             }