其他产废

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/constant/BizObj.java

@@ -18,6 +18,7 @@ public enum BizObj implements DictStr {
     ShiGongDanWei("ShiGongDanWei", "施工单位"),
     ChaiQian("ChaiQian", "拆迁公司"),
     SheQu("SheQu", "社区/村/街道"),
+    QiTa("QiTa", "其他"),
 
     // 清运方
     QiYe("QiYe", "企业"),
@@ -106,7 +107,8 @@ public enum BizObj implements DictStr {
         return this == ShiGongDanWei
                 || this == WuYe
                 || this == ChaiQian
-                || this == SheQu;
+                || this == SheQu
+                || this == QiTa;
     }
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

@@ -173,7 +173,8 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
                     BizObj.WuYe.getVal(),
                     BizObj.ShiGongDanWei.getVal(),
                     BizObj.ChaiQian.getVal(),
-                    BizObj.SheQu.getVal());
+                    BizObj.SheQu.getVal(),
+                    BizObj.QiTa.getVal());
         } else if (bizObj == BizObj.QingYunGongSi) {
             bizObjList = Arrays.asList(
                     BizObj.QiYe.getVal(),

njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/service/CustomerService.java

@@ -72,7 +72,8 @@ public class CustomerService {
                                 BizObj.WuYe,
                                 BizObj.ShiGongDanWei,
                                 BizObj.ChaiQian,
-                                BizObj.SheQu).map(BizObj::getVal).collect(Collectors.toList()))
+                                BizObj.SheQu,
+                                BizObj.QiTa).map(BizObj::getVal).collect(Collectors.toList()))
                         .eq("c.audit_status", AuditStatus.TongGuo);
                 ;
             } else if (bizObj == BizObj.QingYunGongSi) {
@@ -88,6 +89,7 @@ public class CustomerService {
                             BizObj.ShiGongDanWei,
                             BizObj.ChaiQian,
                             BizObj.SheQu,
+                            BizObj.QiTa,
                             BizObj.QiYe,
                             BizObj.GeTi).map(BizObj::getVal).collect(Collectors.toList()))
                     .and(it -> it.eq("c.audit_status", AuditStatus.TongGuo).or().isNull("c.audit_status"));

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java

@@ -159,6 +159,7 @@ public class UserService extends ServiceImpl<UserMapper, UserEntity> implements
                 || bizObj == BizObj.WuYe
                 || bizObj == BizObj.ChaiQian
                 || bizObj == BizObj.SheQu
+                || bizObj == BizObj.QiTa
                 || bizObj == BizObj.QiYe
                 || bizObj == BizObj.GeTi
         ) {