feat:用户部门

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardHourTypeEnum.java

@@ -21,6 +21,6 @@ public enum HardHourTypeEnum {
 
     public static HardHourTypeEnum valueOfByType(String type) {
         if (ObjectUtil.isEmpty(type)) return null;
-        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().orElse(null);
     }
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java

@@ -1,17 +1,15 @@
 package com.bsd.pjcloud.hard.api.vo.order;
 
-import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
-import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
-import com.bsd.pjcloud.wallet.api.entity.WalletCodeUseEntity;
 import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, BaseDeptInterface, BaseMchInterface, BaseHardInterface {
+public class HardOrderVo extends HardOrderEntity implements BaseUserDeptInterface, BaseMchInterface, BaseHardInterface {
     /**
      * 用户相关
      */
@@ -26,6 +24,11 @@ public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, B
      */
     private String deptName;
 
+    /**
+     * 用户部门
+     */
+    private String userDeptName;
+
     /**
      * 商户相关
      */

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/excel/HardOrderExcelVo.java

@@ -24,6 +24,9 @@ public class HardOrderExcelVo {
     @ExcelProperty("部门")
     private String deptName;
 
+    @ExcelProperty("部门")
+    private String userDeptName;
+
     @ExcelProperty("支付方式")
     private String payType;