1

src/main/java/com/fdkankan/sale/common/RepairStatusProcessComing.java

@@ -15,7 +15,7 @@ public enum RepairStatusProcessComing {
     TO_BE_QUOTED(20, "待报价","维修报价","{userName}费用确认中","sale"),
     TO_BE_CONFIRMED(30,"待确认", "维修确认","待确认报价",""),
     TO_BE_CANCELED(40, "已取消","维修支付","待支付费用","sale"),
-    TO_BE_U8SEND(41, "待发件","待发件","待发件",""),
+    TO_BE_U8SEND(41, "待发件","待发件","{userName}正在准备发件","u8"),
     TO_BE_PREPARED(50,"待备料","备件准备", "{userName}正在准备所需备件","repairSupply"),
     TO_BE_REPAIRED(60, "维修中","设备维修","{userName}维修中","repairMan"),
     TO_BE_TESTED(70, "待测试","维修测试","{userName}正在测试","tester"),

src/main/java/com/fdkankan/sale/common/RepairStatusProcessIng.java

@@ -18,8 +18,8 @@ public enum RepairStatusProcessIng {
     TO_BE_QUOTED(20, "待报价","维修检测","{userName}完成检测","repairMan"),
     TO_BE_CONFIRMED(30,"待确认", "维修报价","{userName}完成报价","sale"),
     TO_BE_CANCELED(40, "已取消","维修取消","已取消维修",""),
-    TO_BE_U8SEND(41, "待发件","待发件","待发件",""),
-    TO_BE_PREPARED(50,"待备料","维修确认", "已确认维修",""),
+    TO_BE_U8SEND(41, "待发件","维修确认","已确认维修",""),
+    TO_BE_PREPARED(50,"待备料","已发件", "已发件",""),
     TO_BE_PREPARED_1(51,"维修中添加备件","维修检测", "{userName}维修中添加备件","repairMan"),
     TO_BE_REPAIRED(60, "维修中","备件准备","{userName}完成备料","repairSupply"),
     TO_BE_TESTED(70, "待测试","设备维修","{userName}完成维修","repairMan"),

src/main/java/com/fdkankan/sale/service/ISysUserService.java

@@ -50,4 +50,6 @@ public interface ISysUserService extends IService<SysUser> {
     void updateUser(SysUserParam param);
 
     List<SysUser> getByRoleType(Integer roleType);
+
+    Long getU8UserId();
 }

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -245,6 +245,7 @@ public class RepairInfoService {
                 case "repairMan" : sysUserId = orderReceiving.getRepairManId();break;
                 case "repairSupply" : sysUserId = orderReceiving.getSupplyAdminId();break;
                 case "tester" : sysUserId = orderReceiving.getTesterId();break;
+                case "u8" : sysUserId = sysUserService.getU8UserId();break;
             }
             SysUser sysUser = sysUserService.getById(sysUserId);
             if(sysUser != null){

src/main/java/com/fdkankan/sale/service/impl/SysUserServiceImpl.java

@@ -255,4 +255,13 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         wrapper.in(SysUser::getRoleId,collect);
         return this.list(wrapper);
     }
+
+    @Override
+    public Long getU8UserId() {
+        List<SysUser> sysUsers = this.getByRoleType(6);
+        if(sysUsers == null || sysUsers.size() <= 0 ){
+            return null;
+        }
+        return sysUsers.get(0).getId();
+    }
 }