优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java

@@ -41,4 +41,6 @@ public class BusVehicleApplyQuery implements Query {
     private String applicationCode;
     @ApiModelProperty("当前组织机构的全路径sid")
     private String orgPath;
+
+    private String menuUrl;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsD
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
 import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualsales.*;
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery;
@@ -209,16 +210,22 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (!isSave) {
                 return rb.setMsg("保存失败");
             } else {
+                BigDecimal salesMoney = BigDecimal.ZERO;
+                BigDecimal payMoney = BigDecimal.ZERO;
                 sid = baseVehicleActualSales.getSid();
                 if (scmVehicleActualSalesDto.getDetailsList().size() > 0) {
+                    salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
                     baseVehicleActualDetailsService.saveDetails(scmVehicleActualSalesDto.getDetailsList(), baseVehicleActualSales.getSid());
                 }
                 if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
                     if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) {
+                        payMoney = scmVehicleActualSalesDto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
                         baseVehicleActualPayService.saveDetails(scmVehicleActualSalesDto.getDetailsPayList(), sid);
-
                     }
                 }
+                if(payMoney.compareTo(salesMoney)>0){
+                    return rb.setMsg("付款合计不允许大于买断金额合计");
+                }
 
             }
         } else {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -53,6 +53,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -148,8 +149,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     public PagerVo<BusVehicleApplyVo> listPageVo(PagerQuery<BusVehicleApplyQuery> pq) {
         BusVehicleApplyQuery query = pq.getParams();
         QueryWrapper<BusVehicleApply> qw = new QueryWrapper<>();
-        BusVehicleApplyQuery params = pq.getParams();
+        if (query != null) {
-        if (params != null) {
             String applicationDateStart = query.getApplicationDateStart();
             String applicationDateEnd = query.getApplicationDateEnd();
             qw.apply(StringUtils.isNotBlank(applicationDateStart), "date_format (bva.applicationDate,'%Y-%m-%d') >= date_format('" + applicationDateStart + "','%Y-%m-%d')").
@@ -158,9 +158,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isNotBlank(query.getModelName())) {
                 qw.like("bvad.vehicleName", query.getModelName());
             }
-            if (StringUtils.isNotBlank(query.getUserSid())) {
+
-                qw.eq("bva.createBySid", query.getUserSid());
-            }
             if (StringUtils.isNotBlank(query.getApplyTypeKey())) {
                 qw.eq("bva.applyTypeKey", query.getApplyTypeKey());
             }
@@ -170,9 +168,53 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if(StringUtils.isNotBlank(query.getApplicationCode())){
                 qw.like("bva.applicationCode", query.getApplicationCode());
             }
-            if(StringUtils.isNotBlank(query.getOrgPath())){
+            //========================================数据授权开始
-                String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+            if(StringUtils.isNotBlank(query.getMenuUrl())){
-                qw.eq("bva.createOrgSid",orgPath);
+                //=======================
+                PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+                privilegeQuery.setOrgPath(query.getOrgPath());
+                privilegeQuery.setMenuUrl(query.getMenuUrl());
+                privilegeQuery.setUserSid(query.getUserSid());
+                ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+                if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                    //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                    String orgSidPath = query.getOrgPath();
+                    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("bo.orgSidPath", orgSidPath);
+                    } else if ("2".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i2);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("3".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i3);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("4".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i4);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if("5".equals(orgLevelKey)){
+                        qw.eq("bo.createBySid",query.getUserSid());
+                    }else{
+                        PagerVo<BusVehicleApplyVo> p = new PagerVo<>();
+                        return p;
+                    }
+                }else{
+                    PagerVo<BusVehicleApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                if (StringUtils.isNotBlank(query.getUserSid())) {
+                    qw.eq("bva.createBySid", query.getUserSid());
+                }
+                if (StringUtils.isNotBlank(query.getOrgPath())) {
+                    String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                    qw.eq("bva.createOrgSid", orgPath);
+                }
             }
         }
         qw.orderByDesc("bva.id");

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java

@@ -18,4 +18,6 @@ public class AppDeliveredApplyPageQuery implements Query {
     @ApiModelProperty("用户名称")
     private String name;
 
+    private String menuSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java

@@ -63,4 +63,9 @@ public class BusDeliveredApplyQuery implements Query {
     @ApiModelProperty("销售类型")
     private String paymentMethodKey;
 
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@@ -26,7 +26,6 @@
 package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -215,8 +214,8 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
     @Override
     public ResultBean<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
         ResultBean rb = ResultBean.fireFail();
-        IPage<AppDeliveredApplyPageVo> iPage = busDeliveredApplyService.getRetrievalApplyList(pagerQuery);
+        PagerVo<AppDeliveredApplyPageVo> pv = busDeliveredApplyService.getRetrievalApplyList(pagerQuery);
-        return rb.success().setData(iPage);
+        return rb.success().setData(pv);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -100,6 +100,7 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -228,7 +229,67 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
 
     public PagerVo<BusDeliveredApplyVo> listPageVo(PagerQuery<BusDeliveredApplyQuery> pq) {
         BusDeliveredApplyQuery query = pq.getParams();
-        QueryWrapper<BusDeliveredApply> qw = createQueryWrapper(query);
+        QueryWrapper<BusDeliveredApply> qw = new QueryWrapper<>();
+        if (query != null) {
+            //合同编号
+            if (StringUtils.isNotBlank(query.getContractNo())) {
+                qw.like("bd.contractNo", query.getContractNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(query.getName())) {
+                qw.like("bd.name", query.getName());
+            }
+            if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
+                qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd());
+            }
+            if (StringUtils.isNotBlank(query.getApplyName())) {
+                qw.like("bd.applyName", query.getApplyName());
+            }
+            if (StringUtils.isNotBlank(query.getPaymentMethodKey())) {
+                qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
+            }
+            //========================================数据授权开始
+            if(StringUtils.isNotBlank(query.getMenuUrl())){
+                PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+                privilegeQuery.setOrgPath(query.getOrgPath());
+                privilegeQuery.setMenuUrl(query.getMenuUrl());
+                privilegeQuery.setUserSid(query.getApplySid());
+                ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+                if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                    //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                    String orgSidPath = query.getOrgPath();
+                    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("bo.orgSidPath", orgSidPath);
+                    } else if ("2".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i2);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("3".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i3);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("4".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i4);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if("5".equals(orgLevelKey)){
+                        qw.eq("bo.createBySid",query.getApplySid());
+                    }else{
+                        PagerVo<BusDeliveredApplyVo> p = new PagerVo<>();
+                        return p;
+                    }
+                }else{
+                    PagerVo<BusDeliveredApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                qw.eq("bd.applySid", query.getApplySid());
+            }
+        }
         IPage<BusDeliveredApply> page = PagerUtil.queryToPage(pq);
         IPage<BusDeliveredApplyVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<BusDeliveredApplyVo> p = PagerUtil.pageToVo(pagging, null);
@@ -1339,21 +1400,61 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param pagerQuery
      * @return
      */
-    public IPage<AppDeliveredApplyPageVo> getRetrievalApplyList
+    public PagerVo<AppDeliveredApplyPageVo> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
-    (PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
+        AppDeliveredApplyPageQuery query = pagerQuery.getParams();
         QueryWrapper<AppDeliveredApplyPageQuery> qw = new QueryWrapper<>();
         String orgPath = pagerQuery.getParams().getOrgPath();
-        String orgSid = "";
+        //========================================数据授权开始
-        if (StringUtils.isNotBlank(orgPath)) {
+        if(StringUtils.isNotBlank(query.getMenuSid())){
-            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            //=======================
-        } else {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-            orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                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("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if("5".equals(orgLevelKey)){
+                    qw.eq("bo.createBySid",query.getUserSid());
+                }else{
+                    PagerVo<AppDeliveredApplyPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                PagerVo<AppDeliveredApplyPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }else{
+            String orgSid = "";
+            if (StringUtils.isNotBlank(orgPath)) {
+                orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            } else {
+                orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+            }
         }
-        qw.eq("useOrgSid", orgSid);
-        qw.eq("applySid", pagerQuery.getParams().getUserSid());
         IPage<AppDeliveredApplyPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppDeliveredApplyPageVo> iPage = baseMapper.getRetrievalApplyList(page, qw, pagerQuery.getParams().getName());
-        return iPage;
+        PagerVo<AppDeliveredApplyPageVo> p = PagerUtil.pageToVo(iPage, null);
+        return p;
     }
 
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -234,9 +234,9 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 return p;
             }
         } else {
-           /* PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
+            PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
-            return p;*/
+            return p;
-            qw.eq("createBySid", params.getUserSid());
+//            qw.eq("createBySid", params.getUserSid());
         }
         if (StringUtils.isNotBlank(params.getType())) {//1待准备，2已准备
             qw.eq("handoverPrepareStateKey", params.getType());

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java

@@ -64,4 +64,6 @@ public class AppScmVehicleGressionPageQuery implements Query {
     @ApiModelProperty("分公司sid")
     private String orgPath;
 
+    private String menuSid;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java

@@ -33,4 +33,5 @@ public class ScmVehicleGressionPageQuery implements Query {
     private String operator;
 
     private String orgPath;
+    private String menuUrl;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -37,7 +37,6 @@ import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
@@ -123,13 +122,13 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     @Override
     @ApiOperation("PC端-获取车辆移位列表")
     public ResultBean<PagerVo<ScmVehicleGressionPageVo>> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
-        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
+       /* PagerVo<ScmVehicleGressionPageVo> page = new PagerVo<>();
-            new ResultBean<>().success().setMsg("用户sid不能为空");
-        }
-        PagerVo<ScmVehicleGressionPageVo> page = new PagerVo<>();
         IPage<ScmVehicleGressionPageVo> iPage = scmVehicleGressionService.selectCarTransferList(pagerQuery);
         PagerVo<ScmVehicleGressionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<ScmVehicleGressionPageVo>>().success().setData(pagerVo);
+        return new ResultBean<PagerVo<ScmVehicleGressionPageVo>>().success().setData(pagerVo);*/
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehicleGressionPageVo> pv = scmVehicleGressionService.selectCarTransferList(pagerQuery);
+        return rb.success().setData(pv);
     }
 
     @Override
@@ -154,11 +153,14 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     @ApiOperation("手机端-获取车辆移位列表")
     @PostMapping("/getCarTransferList")
     public ResultBean<PagerVo<AppScmVehicleGressionPageVo>> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
-        ResultBean<PagerVo<AppScmVehicleGressionPageVo>> rb = ResultBean.fireFail();
+      /*  ResultBean<PagerVo<AppScmVehicleGressionPageVo>> rb = ResultBean.fireFail();
         PagerVo<AppScmVehicleGressionPageVo> page = new PagerVo<>();
         IPage<AppScmVehicleGressionPageVo> iPage = scmVehicleGressionService.getCarTransferList(pagerQuery);
         PagerVo<AppScmVehicleGressionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return rb.success().setData(pagerVo);
+        return rb.success().setData(pagerVo);*/
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AppScmVehicleGressionPageVo> pv = scmVehicleGressionService.getCarTransferList(pagerQuery);
+        return rb.success().setData(pv);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -58,6 +58,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit;
@@ -215,11 +216,86 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @param pagerQuery
      * @return
      */
-    public IPage<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
+    public PagerVo<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
         IPage<ScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
-        QueryWrapper<ScmVehicleGressionPageVo> qw = pcQueryWrapper(pagerQuery.getParams());
+//        QueryWrapper<ScmVehicleGressionPageVo> qw = pcQueryWrapper(pagerQuery.getParams());
+        ScmVehicleGressionPageQuery query = pagerQuery.getParams();
+        QueryWrapper<ScmVehicleGressionPageVo> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("svg.handleState", query.getType());
+        }
+        if (StringUtils.isNotBlank(query.getApplyId())) {
+            qw.like("svg.applicantNo", query.getApplyId());
+        }
+        if (StringUtils.isNotBlank(query.getVin())) {
+            qw.like("svg.vinNo", query.getVin());
+        }
+        if (StringUtils.isNotBlank(query.getLocationSid())) {
+            qw.eq("svg.locationSid", query.getLocationSid());
+        }
+        if (StringUtils.isNotBlank(query.getTargetLocationSid())) {
+            qw.eq("svg.targetLocationSid", query.getTargetLocationSid());
+        }
+        if (StringUtils.isNotBlank(query.getOperator())) {
+            qw.like("svg.operator", query.getOperator());
+        }
+        String inventStartDate = query.getApplyDateStart();
+        String inventEndDate = query.getApplyDateEnd();
+        qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (applicantDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
+                );
+        //========================================数据授权开始
+        if(StringUtils.isNotBlank(query.getMenuUrl())){
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                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("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if("5".equals(orgLevelKey)){
+                    qw.eq("bo.createBySid",query.getUserSid());
+                }else{
+                    PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }else{
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                qw.eq("svg.createBySid", query.getUserSid());
+            }
+            if(StringUtils.isNotBlank(query.getOrgPath())){
+                String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("svg.useorgSid",orgpath);
+            }
+
+        }
         IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
         List<ScmVehicleGressionPageVo> records = iPage.getRecords();
         for (ScmVehicleGressionPageVo record : records) {
@@ -244,7 +320,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             }
             record.setImages(image);
         }
-        return iPage;
+        PagerVo<ScmVehicleGressionPageVo> p = PagerUtil.pageToVo(iPage, null);
+        return p;
     }
 
     /**
@@ -255,9 +332,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     private QueryWrapper<ScmVehicleGressionPageVo> pcQueryWrapper(ScmVehicleGressionPageQuery query) {
         QueryWrapper<ScmVehicleGressionPageVo> qw = new QueryWrapper<>();
-//        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-//            qw.eq("svg.useOrgSid", query.getUseOrgSid());
-//        }
         if (StringUtils.isNotBlank(query.getUserSid())) {
             qw.eq("svg.createBySid", query.getUserSid());
         }
@@ -335,12 +409,69 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @param pagerQuery
      * @return
      */
-    public IPage<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
+    public PagerVo<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
         String type = "05";
         IPage<AppScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        QueryWrapper<AppScmVehicleGressionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
+        AppScmVehicleGressionPageQuery query = pagerQuery.getParams();
-        AppScmVehicleGressionPageQuery params = pagerQuery.getParams();
+        QueryWrapper<AppScmVehicleGressionPageVo> qw = new QueryWrapper<>();
-        IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, params.getNames());
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("svg.handleState", query.getType());
+        }
+        //========================================数据授权开始
+        if(StringUtils.isNotBlank(query.getMenuSid())){
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                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("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if("5".equals(orgLevelKey)){
+                    qw.eq("bo.createBySid",query.getUserSid());
+                }else{
+                    PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }else{
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                //切换机构
+                //根据用户所在组织全路径获取分公司sid
+                String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("svg.useOrgSid", orgPath);
+            } else {
+                String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+                qw.eq("svg.useOrgSid", useOrgSid);
+            }
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                qw.eq("svg.createBySid", query.getUserSid());
+            }
+        }
+
+        IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, query.getNames());
         List<AppScmVehicleGressionPageVo> records = iPage.getRecords();
         for (AppScmVehicleGressionPageVo record : records) {
             List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
@@ -361,7 +492,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 record.setShowUploadBtn(false);
             }
         }
-        return iPage;
+        PagerVo<AppScmVehicleGressionPageVo> p = PagerUtil.pageToVo(iPage, null);
+        return p;
     }
 
     /**