优化车辆台账导出

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java

@@ -15,11 +15,8 @@ import java.util.List;
 public class BaseVehicleExportQuery implements Query {
     private static final long serialVersionUID = -1272461446561155125L;
 
-    /**
-     * 选中的sid的list
-     */
-    @ApiModelProperty(value = "sids", required = false)
-    private List<String> sids;
+    @ApiModelProperty(value = "采购系统")
+    private String purchaseSystemName;
     @ApiModelProperty(value = "厂家采购订单类型value")
     private String manPurOrderTypeValue;
     @ApiModelProperty(value = "厂家库龄")
@@ -62,7 +59,11 @@ public class BaseVehicleExportQuery implements Query {
     @ApiModelProperty(value = "买断结束日期")
     private String solidEndDate;
 
-
+    @ApiModelProperty(value = "分公司名称")
+    private String orgName;
+    private String userSid;
+    private String menuUrl;
+    private String menuSid;
     /***************车型查询**********************/
 
     @ApiModelProperty(value = "品牌")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -545,19 +545,61 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public List<BaseVehicleExportVo> listExcel(BaseVehicleExportQuery pagerQuery) {
 
         QueryWrapper<BaseVehicleExportVo> qw = new QueryWrapper<>();
-        List<String> sids = pagerQuery.getSids();
-
-        if (sids != null) {
-            for (String sid : sids) {
-                if (sids.size() != 0) {
-                    qw.in("bv.sid", sid);
+        if (pagerQuery != null) {
+            //========================================数据授权开始
+            if (StringUtils.isNotBlank(pagerQuery.getMenuUrl()) || StringUtils.isNotBlank(pagerQuery.getMenuSid())) {
+                //=======================
+                PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+                privilegeQuery.setOrgPath(pagerQuery.getOrgSidPath());
+                privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
+                privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
+                privilegeQuery.setUserSid(pagerQuery.getUserSid());
+                ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+                if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                    //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                    String orgSidPath = pagerQuery.getOrgSidPath();
+                    orgSidPath = orgSidPath + "/";
+                    int i1 = orgSidPath.indexOf("/");
+                    int i2 = orgSidPath.indexOf("/", i1 + 1);
+                    int i3 = orgSidPath.indexOf("/", i2 + 1);
+                    int i4 = orgSidPath.indexOf("/", i3 + 1);
+                    String orgLevelKey = defaultIdReltBean.getData();
+                    if ("1".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i1);
+                        qw.like("bv.orgSidPath", orgSidPath);
+                    } else if ("2".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i2);
+                        qw.like("bv.orgSidPath", orgSidPath);
+                    } else if ("3".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i3);
+                        qw.like("bv.orgSidPath", orgSidPath);
+                    } else if ("4".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i4);
+                        qw.like("bv.orgSidPath", orgSidPath);
+                    } else if ("5".equals(orgLevelKey)) {
+                        qw.eq("bv.createBySid", pagerQuery.getUserSid());
+                    } else {
+                        List<BaseVehicleExportVo> p = new ArrayList<>();
+                        return p;
+                    }
+                } else {
+                    List<BaseVehicleExportVo> p = new ArrayList<>();
+                    return p;
                 }
             }
-        }
-        if (pagerQuery != null) {
+
             qw.eq("bv.isDelete", "0");
-            if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) {
-                qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
+//            if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) {
+//                qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
+//            }
+            if (StringUtils.isNotBlank(pagerQuery.getOrgName())){
+                qw.like("bv.createOrgName",pagerQuery.getOrgName());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())){
+                qw.like("bv.purchaseSystemName",pagerQuery.getPurchaseSystemName());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
+                qw.eq("bv.createOrgSid", pagerQuery.getOrgSid());
             }
             if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
                 qw.like("bv.vinNo", pagerQuery.getVinNo());