切换机构

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

@@ -24,4 +24,6 @@ public class VehicleCostListQuery implements Query {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @ApiModelProperty("当前组织机构sid全路径")
+    private String orgPath;
 }

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

@@ -2185,10 +2185,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         VehicleCostListQuery query = pagerQuery.getParams();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (query != null) {
-            if (StringUtils.isNotBlank(query.getUserSid())) {
-                ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
+            if(StringUtils.isNotBlank(query.getOrgPath())){
+                ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
                 qw.eq("bv.useOrgSid", resultBean.getData());
+            }else{
+                if (StringUtils.isNotBlank(query.getUserSid())) {
+                    ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
+                    qw.eq("bv.useOrgSid", resultBean.getData());
+                }
             }
+
             if (query.getSidList().size() > 0) {
                 qw.notIn("bv.vinNo", query.getSidList());
             }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java

@@ -68,5 +68,7 @@ public class FinCostapplyQuery implements Query {
     private String applyStartDate;
     @ApiModelProperty(value = "申请结束日期")
     private String applyEndDate;
+    @ApiModelProperty("当前组织机构全路径sid")
+    private String orgPath;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java

@@ -81,4 +81,9 @@ public class FinSelectedReceivablesDetailedDto implements Dto {
 
     @ApiModelProperty("应收未收款项sid")
     private String receivablesSid;
+
+    @ApiModelProperty("全款贷款key:1是全款，2贷款")
+    private String payTypeKey;
+    @ApiModelProperty("全款贷款")
+    private String payType;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java

@@ -73,4 +73,9 @@ public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo {
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;
+
+    @ApiModelProperty("全款贷款key:1是全款，2贷款")
+    private String payTypeKey;
+    @ApiModelProperty("全款贷款")
+    private String payType;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1584,11 +1584,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
         //贷款推送车款
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款","2");
-        //贷款推送订金
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2");
+        finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null));
         if(finSelectedReceivablesDetailedVos1_1.size()>0){
 
+
         }
+        //贷款推送订金
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2");
+        finSelectedReceivablesDetailedVos2_1.removeAll(Collections.singleton(null));
         if(finSelectedReceivablesDetailedVos2_1.size()>0){
 
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -133,6 +133,10 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             if (StringUtils.isNotBlank(pageQuery.getUserSid())) {
                 qw.eq("fc.createBySid", pageQuery.getUserSid());
             }
+            //申请人的组织机构sid全路径
+            if(StringUtils.isNotBlank(pageQuery.getOrgPath())){
+                qw.eq("fc.orgSidPath",pageQuery.getOrgPath());
+            }
         }
         IPage<FinCostapply> page = PagerUtil.queryToPage(pq);
         IPage<FinCostapplyVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -145,7 +149,12 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             //=======================================
-            String orgSidPath = dto.getOrgSidPath();
+            String orgSidPath = "";
+            if(StringUtils.isNotBlank(dto.getOrgPath())){
+                orgSidPath = dto.getOrgPath();
+            }else{
+                orgSidPath = dto.getOrgSidPath();
+            }
             if(StringUtils.isBlank(orgSidPath)){
                 //根据用户sid获取staffSid
                 ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
@@ -270,7 +279,6 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         }else{
             orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
-//        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         FinCostapply finCostapply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, finCostapply);
         if (r == 3) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -2,8 +2,6 @@ package com.yxt.anrui.portal.biz.sysorganization;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
-import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment;
-import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
@@ -63,6 +61,7 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     private RedisUtil redisUtil;
     @Resource
     private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
     private SysStaffinfoService sysStaffInfoService;
 
     @Override