Merge remote-tracking branch 'origin/master'

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

@@ -99,6 +99,7 @@ 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.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign;
 import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffFeign;
 import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffsDto;
 import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto;
@@ -123,6 +124,8 @@ import com.yxt.anrui.riskcenter.api.loansettleapply.SettleFinVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto;
@@ -234,6 +237,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private SysMappingFeign sysMappingFeign;
     @Autowired
     private LoanRestoreReportApplyFeign loanRestoreReportApplyFeign;
+    @Autowired
+    private LoanVehClearanceVehFeign loanVehClearanceVehFeign;
+    @Autowired
+    private LoanBeCollectionVehFeign loanBeCollectionVehFeign;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1488,7 +1495,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (params != null) {
             if (StringUtils.isNotBlank(orgPath)) {
                 useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-                staffDeptSid =orgPath.substring(orgPath.lastIndexOf("/") + 1);
+                staffDeptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
             } else {
                 useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
             }
@@ -1498,8 +1505,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             if (StringUtils.isNotBlank(userSid)) {
                 qw.eq("furd.createBySid", userSid);
             }
-            if(StringUtils.isNotBlank(staffDeptSid)){
+            if (StringUtils.isNotBlank(staffDeptSid)) {
-                qw.eq("furd.staffDeptSid",staffDeptSid);
+                qw.eq("furd.staffDeptSid", staffDeptSid);
             }
             if (params.getSidList().size() > 0) {
                 qw.notIn("furd.sid", params.getSidList());
@@ -4027,8 +4034,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 paymentMoney = planDetails.getPaymentMoney();
                             }
                             if (paymentMoney.compareTo(BigDecimal.ZERO) == 0) {
-                             //存在未终止的垫款申请，且不存在垫款应收
+                                //存在未终止的垫款申请，且不存在垫款应收
-                                int count = baseMapper.selBeVehCountByBusVinSidAndPeriod(planDetails.getBusVinSid(),planDetails.getPeriod());
+                                int count = baseMapper.selBeVehCountByBusVinSidAndPeriod(planDetails.getBusVinSid(), planDetails.getPeriod());
                                 if (count > 0) {
                                     return rb.setMsg("存在未支付垫款数据，认款失败！");
                                 }
@@ -4341,6 +4348,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //与收款金额作比较：更新认款状态  1未认款/2部分认款/3已认款
         confirmation.setPaymentState(3);
         baseMapper.updateById(confirmation);
+        //修改控制状态
+        FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = finSelectedReceivablesDetailedService.fetchKzfByCillSid(confirmation.getSid());
+        if (finSelectedReceivablesDetailedVo != null) {
+            FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = finUncollectedReceivablesDetailedJRService.fetchBySid(finSelectedReceivablesDetailedVo.getReceivablesSid());
+            List<LoanVehClearanceVehDetailsVo> data = loanVehClearanceVehFeign.selByMainSid(finUncollectedReceivablesDetailedJR.getApplySid()).getData();
+            for (LoanVehClearanceVehDetailsVo datum : data) {
+                loanBeCollectionVehFeign.updateLockState(datum.getSaleVehSid(), "3", "4");
+            }
+        }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdfTimes = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String collectionDate = confirmation.getCollectionDate();
@@ -4382,7 +4398,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //----------------------------------------------------------
         //--------------------------推送赎回款---二次销售收款
         Voucher voucher = new Voucher();
-        if(organizationVo != null){
+        if (organizationVo != null) {
             voucher.setAccountBook(organizationVo.getOrgCode());
             voucher.setVoucherNo(organizationVo.getOrgCode());
         }
@@ -4672,7 +4688,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         confirmation.setConfirmDate(DateUtil.today());
         confirmation.setConfirmNameSid(userSid);
         baseMapper.updateById(confirmation);
-        pushToRiskToFin(confirmation,finSelectedReceivablesDetailedVos,collectionDate,voucher);
+        pushToRiskToFin(confirmation, finSelectedReceivablesDetailedVos, collectionDate, voucher);
         //推送凭证业务
         if (!generalVoucherDetails.isEmpty()) {
             generalVoucher.setVoucherDetails(generalVoucherDetails);
@@ -4689,12 +4705,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             collectionAfterVoucher.setVoucherDetails(collectionAfterVoucherDetails);
             finKingDeeFeignRest.saveFeeVoucher(collectionAfterVoucher);
         }
-
-
         return rb.success().setMsg("款项确认成功");
     }
 
-    private void pushToRiskToFin(FinCollectionConfirmation finalConfirmation, List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVoList, String collectionDate,Voucher voucher) {
+    private void pushToRiskToFin(FinCollectionConfirmation finalConfirmation, List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVoList, String collectionDate, Voucher voucher) {
         List<Voucher.VoucherResultDetailDto> list = new ArrayList<>();
         List<Voucher.VoucherResultDetailDto> list2 = new ArrayList<>();
         BigDecimal all = BigDecimal.ZERO;//赎回
@@ -4713,7 +4727,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finalConfirmation.getCreateDeptSid()).getData();
         String customerNumber = "";
-        for (int i = 0; i <finSelectedReceivablesDetailedVoList.size() ; i++) {
+        for (int i = 0; i < finSelectedReceivablesDetailedVoList.size(); i++) {
             FinSelectedReceivablesDetailedVo v = finSelectedReceivablesDetailedVoList.get(i);
             FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(finUncollectedReceivablesDetailed.getBusVinSid()).getData();
@@ -4755,10 +4769,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     customerNumber = busSalesOrderVehicle.getTemporaryNo();
                 }
             }
-            if("9".equals(busSalesOrderVehicle.getRiskState().toString())){//赎回中-赎回凭证
+            if ("9".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证
                 ////营业费用_催收费用 上门催收费用--收回车辆费用（赎回通过后推送的费用）
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
-                if("收回车辆费用".equals(v.getReceivablesName())){
+                if ("收回车辆费用".equals(v.getReceivablesName())) {
                     all = all.add(new BigDecimal(v.getSubscriptionMoney()));
                     voucherResultDetailDtoJf2.setSummary("收款-赎回费用");
                     voucherResultDetailDtoJf2.setSubjectNo("6601.32.05");
@@ -4771,7 +4785,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
                 //预提费用 待确认逾期利息 待确认途期利息--资金占用费转收入
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto();
-                if("资金占用费".equals(v.getReceivablesName())){//借方
+                if ("资金占用费".equals(v.getReceivablesName())) {//借方
                     voucherResultDetailDtoJf3.setSummary("资金占用费转收入");
                     voucherResultDetailDtoJf3.setSubjectNo("2191.05.00");
                     //核算部门
@@ -4783,7 +4797,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
                 //应收贷款车欠款_待处理欠款_扣回车辆--月还/资方逾期利息
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
-                if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())){
+                if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
                     all = all.add(new BigDecimal(v.getSubscriptionMoney()));
                     voucherResultDetailDtoDf.setSummary("收款-赎回款");
                     voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
@@ -4797,7 +4811,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
                 //应收贷款车欠款_到期欠款_逾期利息--资金占用费
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
-                if("资金占用费".equals(v.getReceivablesName())){
+                if ("资金占用费".equals(v.getReceivablesName())) {
                     all = all.add(new BigDecimal(v.getSubscriptionMoney()));
                     voucherResultDetailDtoDf2.setSummary("收款-赎回款");
                     voucherResultDetailDtoDf2.setSubjectNo("1201.02.03");
@@ -4810,7 +4824,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
                 //资金占用费转收入--其他业务收入_消贷收入_消贷利息
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
-                if("资金占用费".equals(v.getReceivablesName())){//贷方
+                if ("资金占用费".equals(v.getReceivablesName())) {//贷方
                     voucherResultDetailDtoDf3.setSummary("资金占用费转收入");
                     voucherResultDetailDtoDf3.setSubjectNo("6002.01.17");
                     //核算部门
@@ -4820,9 +4834,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     voucherResultDetailDtoDf3.setCredit(v.getSubscriptionMoney());
                     list.add(voucherResultDetailDtoDf3);
                 }
-            }else if("10".equals(busSalesOrderVehicle.getRiskState().toString())){//二次销售中-二次销售凭证
+            } else if ("10".equals(busSalesOrderVehicle.getRiskState().toString())) {//二次销售中-二次销售凭证
 
-                if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())){
+                if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
                     Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                     all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
                     voucherResultDetailDtoDf.setSummary("***扣回车辆再次销售款");
@@ -4835,7 +4849,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     list2.add(voucherResultDetailDtoDf);
                 }
 
-                if("资金占用费".equals(v.getReceivablesName())){
+                if ("资金占用费".equals(v.getReceivablesName())) {
                     Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
                     all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
                     voucherResultDetailDtoDf2.setSummary("***扣回车辆再次销售款");
@@ -4848,7 +4862,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     list2.add(voucherResultDetailDtoDf2);
                 }
 
-                if("预计资方结清费用".equals(v.getReceivablesName())){
+                if ("预计资方结清费用".equals(v.getReceivablesName())) {
                     Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
                     all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
                     voucherResultDetailDtoDf3.setSummary("**扣回车辆再次销售-资方结清费用");
@@ -4861,7 +4875,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     list2.add(voucherResultDetailDtoDf3);
                 }
 
-                if("停车费".equals(v.getReceivablesName())){
+                if ("停车费".equals(v.getReceivablesName())) {
                     Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
                     all2 = all2.subtract(new BigDecimal(v.getSubscriptionMoney()));
                     voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-停车费");
@@ -4873,15 +4887,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     voucherResultDetailDtoJf2.setDebit(new BigDecimal(v.getSubscriptionMoney()).negate().toString());
                     list2.add(voucherResultDetailDtoJf2);
                 }
-                if("车辆违章费用".equals(v.getReceivablesName()) || "年检费".equals(v.getReceivablesName()) ||
+                if ("车辆违章费用".equals(v.getReceivablesName()) || "年检费".equals(v.getReceivablesName()) ||
                         "保险费".equals(v.getReceivablesName()) || "过户费".equals(v.getReceivablesName())
-                        ){
+                ) {
                     otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney()));
                 }
             }
         }
         //客户赎回收款
-        if(all.compareTo(BigDecimal.ZERO)>0){
+        if (all.compareTo(BigDecimal.ZERO) > 0) {
             Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
             if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
                 voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
@@ -4892,7 +4906,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             list.add(voucherResultDetailDtoJf);
         }
 
-        if(otherMoney.compareTo(BigDecimal.ZERO)>0){
+        if (otherMoney.compareTo(BigDecimal.ZERO) > 0) {
             Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
             all2 = all2.subtract(otherMoney);
             voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-费用（违章、年检、保险、过户）");
@@ -4904,7 +4918,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             voucherResultDetailDtoJf2.setDebit(otherMoney.negate().toString());
             list2.add(voucherResultDetailDtoJf2);
         }
-        if(all2.compareTo(BigDecimal.ZERO)>0){
+        if (all2.compareTo(BigDecimal.ZERO) > 0) {
             Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
             if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
                 voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
@@ -4915,11 +4929,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             list2.add(voucherResultDetailDtoJf);
         }
 
-        if(!list.isEmpty()){
+        if (!list.isEmpty()) {
             voucher.setResultDetails(list);
             finKingDeeFeignRest.saveVoucher(voucher);
         }
-        if(list2.isEmpty()){
+        if (list2.isEmpty()) {
             voucher.setResultDetails(list2);
             finKingDeeFeignRest.saveVoucher(voucher);
         }
@@ -4990,7 +5004,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //--收款-赎回款(yyyy-MM-dd)
         BigDecimal all = new BigDecimal(v.getSubscriptionMoney());
         if (all.compareTo(BigDecimal.ZERO) != 0) {
-            voucherResultDetailDtoJf.setSummary("收款-赎回款"+"（" + collectionDate + "）");
+            voucherResultDetailDtoJf.setSummary("收款-赎回款" + "（" + collectionDate + "）");
             voucherResultDetailDtoJf.setSubjectNo(payType);
             voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
             voucherResultDetailDtoJf.setDebit(all.toString());
@@ -5029,7 +5043,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         BigDecimal allM = BigDecimal.ZERO;
         allM = all.subtract(zjzyfMoney);
-        if(allM.compareTo(BigDecimal.ZERO)>0){
+        if (allM.compareTo(BigDecimal.ZERO) > 0) {
             voucherResultDetailDtoDf2.setSummary("收款-赎回款");
             voucherResultDetailDtoDf2.setSubjectNo("1201.03.01");
             //核算部门
@@ -6222,36 +6236,38 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         for (AppFinSelectedReceivablesDetailedRskDto v : finSelectedReceivablesDetailedDtos) {
             String loanContractNo = v.getLoanContractNo();
             String vinNo = v.getVin();
-            List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid());
+            if (!v.getProjectName().equals("远程控制费")) {
-            if (!ruleList.isEmpty()) {
+                List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid());
-                for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) {
+                if (!ruleList.isEmpty()) {
-                    if (r.getProjectName().equals("月还") || r.getProjectName().equals("资方逾期利息")) {
+                    for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) {
-                        if (Integer.valueOf(r.getPeriod()) < Integer.valueOf(v.getPeriod())) {
+                        if (r.getProjectName().equals("月还") || r.getProjectName().equals("资方逾期利息")) {
-                            List<AppFinSelectedReceivablesDetailedRskDto> collect = finSelectedReceivablesDetailedDtos.stream().filter(new Predicate<AppFinSelectedReceivablesDetailedRskDto>() {
+                            if (Integer.valueOf(r.getPeriod()) < Integer.valueOf(v.getPeriod())) {
-                                @Override
+                                List<AppFinSelectedReceivablesDetailedRskDto> collect = finSelectedReceivablesDetailedDtos.stream().filter(new Predicate<AppFinSelectedReceivablesDetailedRskDto>() {
-                                public boolean test(AppFinSelectedReceivablesDetailedRskDto d) {
+                                    @Override
-                                    if (d.getPeriod().equals(r.getPeriod()) && d.getLoanContractNo().equals(r.getLoanContractNo()) && d.getVin().equals(r.getVin())) {
+                                    public boolean test(AppFinSelectedReceivablesDetailedRskDto d) {
-                                        return true;
+                                        if (d.getPeriod().equals(r.getPeriod()) && d.getLoanContractNo().equals(r.getLoanContractNo()) && d.getVin().equals(r.getVin())) {
+                                            return true;
+                                        }
+                                        return false;
                                     }
-                                    return false;
+                                }).collect(Collectors.toList());
+                                if (collect.isEmpty()) {
+                                    return rb.setMsg("您的认款顺序与公司认款规则不一致");
                                 }
-                            }).collect(Collectors.toList());
-                            if (collect.isEmpty()) {
-                                return rb.setMsg("您的认款顺序与公司认款规则不一致");
                             }
                         }
                     }
                 }
-            }
+                for (AppFinSelectedReceivablesDetailedRskDto f : finSelectedReceivablesDetailedDtos) {
-            for (AppFinSelectedReceivablesDetailedRskDto f : finSelectedReceivablesDetailedDtos) {
+                    if (v.getProjectName().equals("月还") || v.getProjectName().equals("资方逾期利息")) {
-                if (v.getProjectName().equals("月还") || v.getProjectName().equals("资方逾期利息")) {
+                        if (v.getVin().equals(f.getVin()) && v.getLoanContractNo().equals(f.getLoanContractNo())) {
-                    if (v.getVin().equals(f.getVin()) && v.getLoanContractNo().equals(f.getLoanContractNo())) {
+                            if (f.getProjectName().equals("月还") || f.getProjectName().equals("资方逾期利息")) {
-                        if (f.getProjectName().equals("月还") || f.getProjectName().equals("资方逾期利息")) {
+                                if (Integer.valueOf(f.getPeriod()) > Integer.valueOf(v.getPeriod())) {
-                            if (Integer.valueOf(f.getPeriod()) > Integer.valueOf(v.getPeriod())) {
+                                    BigDecimal noReceivable = v.getNoReceivable();
-                                BigDecimal noReceivable = v.getNoReceivable();
+                                    BigDecimal confirmMoney = v.getConfirmMoney();
-                                BigDecimal confirmMoney = v.getConfirmMoney();
+                                    if (confirmMoney.compareTo(noReceivable) < 0) {
-                                if (confirmMoney.compareTo(noReceivable) < 0) {
+                                        return rb.setMsg("您的认款顺序与公司认款规则不一致");
-                                    return rb.setMsg("您的认款顺序与公司认款规则不一致");
+                                    }
                                 }
                             }
                         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -72,6 +72,8 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     @Select("select * from fin_selected_receivables_detailed where collSid = #{sid}")
     List<FinSelectedReceivablesDetailedVo> fetchByCillSid(String sid);
 
+    @Select("select * from fin_selected_receivables_detailed where collSid = #{collSid} and receivablesName = '远程控制费'")
+    FinSelectedReceivablesDetailedVo fetchKzfByCillSid(String collSid);
 
     /**
      * 手机端—查询可使用款项明细列表

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -906,4 +906,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         BigDecimal rkMoney = baseMapper.selRkByBillSid(billSid);
         return rb.success().setData(rkMoney);
     }
+
+    public FinSelectedReceivablesDetailedVo fetchKzfByCillSid(String collSid) {
+        return baseMapper.fetchKzfByCillSid(collSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java

@@ -37,8 +37,7 @@ import org.springframework.web.bind.annotation.*;
 @FeignClient(
         contextId = "anrui-riskcenter-LoanBeCollectionVeh",
         name = "anrui-riskcenter",
-        path = "v1/loanbecollectionveh",
+        path = "v1/loanbecollectionveh")
-        fallback = LoanBeCollectionVehFeignFallback.class)
 public interface LoanBeCollectionVehFeign {
 
     @ApiOperation("根据条件分页查询数据的列表")
@@ -70,4 +69,9 @@ public interface LoanBeCollectionVehFeign {
     @PostMapping("/saveDbr")
     @ResponseBody
     public ResultBean saveDbr(@RequestBody LoanBeCollectionVehDbrDto dto);
+
+    @ApiOperation("修改控制状态")
+    @GetMapping("/updateLockState")
+    @ResponseBody
+    ResultBean updateLockState(@RequestParam("saleVehSid") String saleVehSid, @RequestParam("s") String s, @RequestParam("x") String x);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java

@@ -35,21 +35,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanFileexamine",
@@ -67,12 +52,12 @@ public interface LoanFileexamineFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanFileexamineDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -86,7 +71,7 @@ public interface LoanFileexamineFeign {
     @ApiOperation("根据销售订单和消贷合同sid查询资料审核信息")
     @GetMapping("/selectOrderSidAndContract")
     @ResponseBody
-    ResultBean<LoanFileexamine> selectOrderSidAndContract(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "loanContractSid",required = false) String loanContractSid);
+    ResultBean<LoanFileexamine> selectOrderSidAndContract(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "loanContractSid", required = false) String loanContractSid);
 
     @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
     @GetMapping("/getToDoNum")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanrestorereportapply;
 
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.flowable.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,19 +38,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请) <br/>
- * File: LoanRestoreReportApplyFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyFeign <br/>
- * Description: 车辆交回事前报备申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-01-08 11:43:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆交回事前报备申请")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanRestoreReportApply",
@@ -70,12 +55,12 @@ public interface LoanRestoreReportApplyFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanRestoreReportApplyDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeign.java

@@ -27,52 +27,21 @@ package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceVehFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign <br/>
- * Description: 车辆远程解控车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆远程解控车辆")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanVehClearanceVeh",
         name = "anrui-riskcenter",
-        path = "v1/loanvehclearanceveh",
+        path = "v1/loanvehclearanceveh")
-        fallback = LoanVehClearanceVehFeignFallback.class)
 public interface LoanVehClearanceVehFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据申请sid获取子表")
-    @PostMapping("/listPage")
+    @GetMapping("/selByMainSid/{applySid}")
     @ResponseBody
-    public ResultBean<PagerVo<LoanVehClearanceVehVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceVehQuery> pq);
+    ResultBean<List<LoanVehClearanceVehDetailsVo>> selByMainSid(@PathVariable("applySid") String applySid);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody LoanVehClearanceVehDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<LoanVehClearanceVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeignFallback.java

@@ -1,72 +0,0 @@
-/*********************************************************
- *********************************************************
- ********************                  *******************
- *************                                ************
- *******                  _oo0oo_                  *******
- ***                     o8888888o                     ***
- *                       88" . "88                       *
- *                       (| -_- |)                       *
- *                       0\  =  /0                       *
- *                     ___/`---'\___                     *
- *                   .' \\|     |// '.                   *
- *                  / \\|||  :  |||// \                  *
- *                 / _||||| -:- |||||- \                 *
- *                |   | \\\  -  /// |   |                *
- *                | \_|  ''\---/''  |_/ |                *
- *                \  .-\__  '-'  ___/-. /                *
- *              ___'. .'  /--.--\  `. .'___              *
- *           ."" '<  `.___\_<|>_/___.' >' "".            *
- *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
- *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
- *      =====`-.____`.___ \_____/___.-`___.-'=====       *
- *                        `=---='                        *
- *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
-
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceVehFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeignFallback <br/>
- * Description: 车辆远程解控车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
-@Component
-public class LoanVehClearanceVehFeignFallback implements LoanVehClearanceVehFeign {
-
-	@Override
-	public ResultBean<PagerVo<LoanVehClearanceVehVo>> listPage(PagerQuery<LoanVehClearanceVehQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-riskcenter/loanvehclearanceveh/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(LoanVehClearanceVehDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceveh/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceveh/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<LoanVehClearanceVehDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-riskcenter/loanvehclearanceveh/fetchDetailsBySid无法访问");
-	}
-}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java

@@ -37,74 +37,68 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(催收措施申请) <br/>
- * File: LoanBeCollectionVehFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest <br/>
- * Description: 逾期催收车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-12 16:06:20 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "逾期催收车辆")
-@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest")
+@RestController
 @RequestMapping("v1/loanbecollectionveh")
 public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign {
 
-	@Autowired
+    @Autowired
-	private LoanBeCollectionVehService loanBeCollectionVehService;
+    private LoanBeCollectionVehService loanBeCollectionVehService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanBeCollectionVehVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionVehQuery> pq){
+    public ResultBean<PagerVo<LoanBeCollectionVehVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionVehQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanBeCollectionVehVo> pv = loanBeCollectionVehService.listPageVo(pq);
+        PagerVo<LoanBeCollectionVehVo> pv = loanBeCollectionVehService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody LoanBeCollectionVehDto dto){
+    public ResultBean save(@RequestBody LoanBeCollectionVehDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionVehService.saveOrUpdateDto(dto);
+        loanBeCollectionVehService.saveOrUpdateDto(dto);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionVehService.delBySids(sids);
+        loanBeCollectionVehService.delBySids(sids);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanBeCollectionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<LoanBeCollectionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid);
+        LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<LoanBeCollectionVehDbrDetailsVo> initDbr(String saleVehSid) {
+    public ResultBean<LoanBeCollectionVehDbrDetailsVo> initDbr(String saleVehSid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid);
+        LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid);
-		return rb.success().setData(loanBeCollectionVehDbrDetailsVo);
+        return rb.success().setData(loanBeCollectionVehDbrDetailsVo);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) {
+    public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionVehService.saveDbr(dto);
+        loanBeCollectionVehService.saveDbr(dto);
-		return rb.success();
+        return rb.success();
-	}
+    }
+
+    @Override
+    public ResultBean updateLockState(String saleVehSid, String s, String x) {
+        ResultBean rb = ResultBean.fireFail();
+        loanBeCollectionVehService.updateLockState(saleVehSid, s, x);
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java

@@ -56,19 +56,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(催收措施申请) <br/>
- * File: LoanBeCollectionVehService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehService <br/>
- * Description: 逾期催收车辆 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-12 16:06:20 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollectionVehMapper, LoanBeCollectionVeh> {
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -5,26 +5,26 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineVo">
         SELECT
-        lf.`sid`,
+        lf.sid,
         bo.sid AS saleOrderSid,
-        bo.`useOrgName`,
+        bo.useOrgName,
-        bo.`orgName`,
+        bo.orgName,
-        bo.`staffName`,
+        bo.staffName,
-        lf.`bankStateValue`,
+        lf.bankStateValue,
-        IF(lf.`zlState` = 0, '未齐全', '已齐全') AS zlState,
+        IF(lf.zlState = 0, '未齐全', '已齐全') AS zlState,
         bl.sid AS loanContractSid,
-        bl.`loanContractNo`,
+        bl.loanContractNo,
-        bl.`vehCount` AS num,
+        bl.vehCount AS num,
-        bl.`borrowerName`,
+        bl.borrowerName,
-        bl.`bankName`,
+        bl.bankName,
-        bl.`policyName`,
+        bl.policyName,
-        bl.`bankContractNo`
+        bl.bankContractNo
         FROM
         loan_fileexamine lf
-        LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+        LEFT JOIN anrui_buscenter.bus_sales_order bo
-        ON lf.`saleOrderSid` = bo.`sid`
+        ON lf.saleOrderSid = bo.sid
-        LEFT JOIN anrui_buscenter.`bus_sales_order_loancontract` bl
+        LEFT JOIN anrui_buscenter.bus_sales_order_loancontract bl
-        ON lf.`loanContractSid` = bl.`sid`
+        ON lf.loanContractSid = bl.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -44,11 +44,11 @@
     <select id="getToDoNum" resultType="int">
         SELECT COUNT(*)
         FROM loan_fileexamine lf
-                     LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+                     LEFT JOIN anrui_buscenter.bus_sales_order bo
-                ON lf.`saleOrderSid` = bo.`sid`
+                ON lf.saleOrderSid = bo.sid
         WHERE bo.createBySid = #{userSid}
           AND bo.orgSidPath = #{orgPath}
-          AND lf.`zlState` = '0'
+          AND lf.zlState = '0'
     </select>
 
     <update id="setState">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java

@@ -37,82 +37,69 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
-@RestController("com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest")
+@RestController
 @RequestMapping("v1/loanfileexamine")
 public class LoanFileexamineRest implements LoanFileexamineFeign {
 
-	@Autowired
+    @Autowired
-	private LoanFileexamineService loanFileexamineService;
+    private LoanFileexamineService loanFileexamineService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanFileexamineVo>> listPage(@RequestBody PagerQuery<LoanFileexamineQuery> pq){
+    public ResultBean<PagerVo<LoanFileexamineVo>> listPage(@RequestBody PagerQuery<LoanFileexamineQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanFileexamineVo> pv = loanFileexamineService.listPageVo(pq);
+        PagerVo<LoanFileexamineVo> pv = loanFileexamineService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody LoanFileexamineDto dto){
+    public ResultBean save(@RequestBody LoanFileexamineDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanFileexamineService.saveOrUpdateDto(dto);
+        loanFileexamineService.saveOrUpdateDto(dto);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanFileexamineService.delBySids(sids);
+        loanFileexamineService.delBySids(sids);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<LoanFileexamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid);
+        LoanFileexamineDetailsVo vo = loanFileexamineService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean uploadFile(LoanFileDto loanFileDto) {
+    public ResultBean uploadFile(LoanFileDto loanFileDto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		loanFileexamineService.uploadFile(loanFileDto);
+        loanFileexamineService.uploadFile(loanFileDto);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<LoanFileexamine> selectOrderSidAndContract(String saleOrderSid, String loanContractSid) {
+    public ResultBean<LoanFileexamine> selectOrderSidAndContract(String saleOrderSid, String loanContractSid) {
-		return loanFileexamineService.selectOrderSidAndContract(saleOrderSid,loanContractSid);
+        return loanFileexamineService.selectOrderSidAndContract(saleOrderSid, loanContractSid);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+    public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
-		return loanFileexamineService.getToDoNum(riskToDoNumQuery);
+        return loanFileexamineService.getToDoNum(riskToDoNumQuery);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<String> selectOrderSid(String saleOrderSid) {
+    public ResultBean<String> selectOrderSid(String saleOrderSid) {
-		return loanFileexamineService.selectOrderSid(saleOrderSid);
+        return loanFileexamineService.selectOrderSid(saleOrderSid);
-	}
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -33,28 +33,19 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
-import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
-import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
-import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.*;
-import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileFeign;
 import com.yxt.anrui.riskcenter.biz.loancapitalcreditresult.LoanCapitalCreditResultService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
@@ -72,19 +63,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineService <br/>
- * Description: 放款资料审核 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMapper, LoanFileexamine> {
 
@@ -108,8 +86,6 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
     @Autowired
     private LoanCapitalCreditResultService loanCapitalCreditResultService;
-    @Autowired
-    private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
 
     public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
         LoanFileexamineQuery query = pq.getParams();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -115,4 +115,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     String selByBusVinSid(@Param("saleVehSid") String saleVehSid,@Param("date") String date);
 
     String selByBusVinSidMax(String saleVehSid);
+
+    String getWdq(String busVinSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -944,8 +944,7 @@
         SELECT
         ROUND(
         SUM(ss.yq_total) +
-        COALESCE(lbpv_sum.bankBeInter_sum, 0) +
+        COALESCE(lbpv_sum.bankBeInter_sum, 0),
-        COALESCE(lfd_sum.fund_sum, 0),
         2) AS beMoney
         FROM (
         SELECT
@@ -968,51 +967,30 @@
         WHERE saleVehSid = #{busVinSid}
         GROUP BY saleVehSid
         ) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
-        LEFT JOIN (
-        SELECT
-        a.busVinSid,
-        SUM(a.fund) AS fund_sum
-        FROM (
-        SELECT
-        (fjj.reveivableMoney - fjj.m) AS fund,
-        lp.busVinSid
-        FROM (
-        SELECT IFNULL((
-        SELECT SUM(subscriptionMoney)
-        FROM anrui_fin.fin_selected_receivables_detailed AS s
-        WHERE s.auditState = '3'
-        AND s.receivablesSid = fj.sid
-        ), 0) AS m,
-        fj.*
-        FROM (
-        SELECT j.busSid, j.sid, j.reveivableMoney
-        FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j
-        WHERE j.payCostTitleKey = '006'
-        ) AS fj
-        ) AS fjj
-        LEFT JOIN loan_repayment_plan_details lp
-        ON lp.sid = fjj.busSid
-        WHERE lp.dueDate  <= lp.updateTime
-        AND lp.busVinSid = #{busVinSid}
-        ) a
-        GROUP BY a.busVinSid
-        ) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
 
     </select>
 
     <select id="getBj" resultType="java.lang.String">
-        select sum(ss.yq_total) from (
         SELECT
-        lrpd.sid,
+            SUM(principal_amount) AS total_principal
-        lrpd.busVinSid,
+        FROM (
-        (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS yq_total
+                 SELECT
-        FROM loan_repayment_plan_details lrpd
+                     lrpd.sid,
-        LEFT JOIN loan_repayment_history lrh
+                     lrpd.busVinSid,
-        ON lrh.planDetailSid = lrpd.sid
+                     (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS principal_amount
-        WHERE lrpd.dueDate  &lt;= lrpd.updateTime
+                 FROM
-        AND lrpd.busVinSid =#{busVinSid}
+                     loan_repayment_plan_details lrpd
-        AND lrpd.oweState = '1'
+                         LEFT JOIN
-        GROUP BY lrpd.sid)ss
+                     loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid
+                 WHERE
+                     lrpd.busVinSid = #{busVinSid}
+                   AND lrpd.oweState = '1'  -- 是否转累欠状态为"否"(1)
+                   AND lrpd.dueDate BETWEEN
+                     DATE_FORMAT(CURRENT_DATE, '%Y-%m-01')  -- 本月第一天
+                     AND LAST_DAY(CURRENT_DATE)             -- 本月最后一天
+                 GROUP BY
+                     lrpd.sid, lrpd.busVinSid, lrpd.dueMoney
+             ) AS principal_details
 
     </select>
 
@@ -1031,4 +1009,24 @@
         ORDER BY period DESC
             LIMIT 1
     </select>
+
+    <select id="getWdq" resultType="java.lang.String">
+        SELECT
+            SUM(future_due_amount) AS total_future_due
+        FROM (
+                 SELECT
+                     lrpd.sid,
+                     lrpd.busVinSid,
+                     (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) AS future_due_amount
+                 FROM
+                     loan_repayment_plan_details lrpd
+                         LEFT JOIN
+                     loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid
+                 WHERE
+                     lrpd.busVinSid = #{busVinSid}
+                   AND lrpd.dueDate > LAST_DAY(CURRENT_DATE)  -- 应还日期在当月之后
+                 GROUP BY
+                     lrpd.sid, lrpd.busVinSid, lrpd.dueMoney
+             ) AS future_due_details
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -383,7 +383,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     public String getYqLq(String busVinSid) {
         return baseMapper.getYqLq(busVinSid);
     }
-
+    //应收贷款车欠款_到期欠款_本金
     public String getBj(String busVinSid) {
         return baseMapper.getBj(busVinSid);
     }
@@ -395,4 +395,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     public String selByBusVinSidMax(String saleVehSid) {
         return baseMapper.selByBusVinSidMax(saleVehSid);
     }
+
+    public String getWdq(String busVinSid) {
+        return baseMapper.getWdq(busVinSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@@ -336,7 +336,9 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         loanRestoreReportApplyDetailsVo.setCsjlSid(saleVehSid);
         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
         LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
-        loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
+        if (loanSolutions != null){
+            loanRestoreReportApplyDetailsVo.setJrfaSid(loanSolutions.getSid());
+        }
         loanRestoreReportApplyDetailsVo.setSaleVehSid(saleVehSid);
         AlrepaidAndArrVo alrepaidAndArr = getAlrepaidAndArr2(saleVehSid);
         loanRestoreReportApplyDetailsVo.setAlRepaidMoney(alrepaidAndArr.getAlRepaidMoney());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -709,7 +709,13 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
                 customerNumber = busSalesOrderVehicle.getTemporaryNo();
             }
         }
-        AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(loanReturnInboundApply.getBusVinSid());
+        //----------------------计算规则------------------------------------
+        //扣回入库推送凭证包含以下：
+        //1、累欠 = 该车的还款明细中是否转累欠状态为是0的逾期的未还金额+垫资方逾期利息余额
+        //2、未到期欠款 = 该车的还款明细中应还日期在当月之后的未还金额之和
+        //3、本金 = 该车的还款明细中是否转累欠状态为否1的且应还日期是本月的未还金额
+        //4、扣回车辆 = 累欠+未到期欠款+本金
+        
         //应收贷款车欠款_待处理欠款_扣回车辆
         BigDecimal all = BigDecimal.ZERO;
         //应收贷款车欠款_到期欠款_累欠
@@ -721,23 +727,17 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         String lq = loanRepaymentPlanDetailsService.getYqLq(loanReturnInboundApply.getBusVinSid());
         lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
         //未到期欠款
-        String wdq = alrepaidAndArrVo.getUnexpiredMoney();
+        String wdq = loanRepaymentPlanDetailsService.getWdq(loanReturnInboundApply.getBusVinSid());
         wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
         String bj = loanRepaymentPlanDetailsService.getBj(loanReturnInboundApply.getBusVinSid());
         bjMoney = bjMoney.add(new BigDecimal(StringUtils.isBlank(bj) ? "0" : bj));
         all = lqMoney.add(wdqMoney).add(bjMoney);
 
-
         List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
-        //借方
-        Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
-        //贷方
-        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf1 = new Voucher.VoucherResultDetailDto();
-        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
-        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
-
         //-------------------------------------------应收贷款车欠款_待处理欠款_扣回车辆
         if (all.compareTo(BigDecimal.ZERO) != 0) {
+            //借方
+            Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
             voucherResultDetailDtoJf.setSummary("扣回车辆入库");
             voucherResultDetailDtoJf.setSubjectNo("1201.03.01");
             //核算部门
@@ -747,9 +747,10 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
             voucherResultDetailDtoJf.setDebit(all.toString());
             voucherResultDetailDtos.add(voucherResultDetailDtoJf);
         }
-
+        //---------------------------------------------应收贷款车欠款_到期欠款_累欠---是否转累欠状态为0的未还金额+垫资方逾期利息月
-        //---------------------------------------------应收贷款车欠款_到期欠款_累欠
         if (lqMoney.compareTo(BigDecimal.ZERO) != 0) {
+            //贷方
+            Voucher.VoucherResultDetailDto voucherResultDetailDtoDf1 = new Voucher.VoucherResultDetailDto();
             voucherResultDetailDtoDf1.setSummary("扣回车辆入库");
             voucherResultDetailDtoDf1.setSubjectNo("1201.02.03");
             //核算部门
@@ -760,8 +761,9 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
             voucherResultDetailDtos.add(voucherResultDetailDtoDf1);
         }
 
-        //--------------------------------------------应收贷款车欠款_未到期欠款_未到期欠款
+        //--------------------------------------------应收贷款车欠款_未到期欠款_未到期欠款--按当月算，应还日期在当月之后的
         if (wdqMoney.compareTo(BigDecimal.ZERO) != 0) {
+            Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
             voucherResultDetailDtoDf2.setSummary("扣回车辆入库");
             voucherResultDetailDtoDf2.setSubjectNo("1201.01.00");
             //核算部门
@@ -772,8 +774,9 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
             voucherResultDetailDtos.add(voucherResultDetailDtoDf2);
         }
 
-        //-------------------------------------------应收贷款车欠款_到期欠款_本金
+        //-------------------------------------------应收贷款车欠款_到期欠款_本金-----应还日期是本月的都算本金，没有转累欠的
         if (bjMoney.compareTo(BigDecimal.ZERO) != 0) {
+            Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
             voucherResultDetailDtoDf3.setSummary("扣回车辆入库");
             voucherResultDetailDtoDf3.setSubjectNo("1201.02.01");
             //核算部门
@@ -806,6 +809,16 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         stkMiscellaneousEntry.setFSTOCKID("ARZSCK");
         stkMiscellaneousEntry.setFOWNERID(sysOrg.getOrgCode());
         stkMiscellaneousEntryList.add(stkMiscellaneousEntry);
+        if ("是".equals(loanReturnInboundApply.getTralier())) {//挂车
+            LoanReturnInboundTrailer loanReturnInboundTrailer = loanReturnInboundTrailerService.selectByMainSid(loanReturnInboundApply.getSid());
+            stkMiscellaneousEntry = new StkMiscellaneous.StkMiscellaneousEntry();
+            stkMiscellaneousEntry.setFMATERIALID(loanReturnInboundTrailer.getVinNo());
+            stkMiscellaneousEntry.setFUnitID("liang");
+            stkMiscellaneousEntry.setFSTOCKID("ARZSCK");
+            stkMiscellaneousEntry.setFOWNERID(sysOrg.getOrgCode());
+            stkMiscellaneousEntryList.add(stkMiscellaneousEntry);
+        }
+
         stkMiscellaneous.setStkMiscellaneousEntry(stkMiscellaneousEntryList);
         ResultBean resultBean = finKingDeeFeign.draftStkMiscellaneous(stkMiscellaneous);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java

@@ -39,35 +39,12 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceVehMapper.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehMapper <br/>
- * Description: 车辆远程解控车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface LoanVehClearanceVehMapper extends BaseMapper<LoanVehClearanceVeh> {
 
-	//@Update("update loan_veh_clearance_veh set name=#{msg} where id=#{id}")
+    @Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}")
-	//IPage<LoanVehClearanceVehVo> voPage(IPage<LoanVehClearanceVeh> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceVeh> qw);
-	
-	IPage<LoanVehClearanceVehVo> selectPageVo(IPage<LoanVehClearanceVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanVehClearanceVeh> qw);
-	
-	List<LoanVehClearanceVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanVehClearanceVeh> qw);
-	
-	@Select("select * from loan_veh_clearance_veh")
-	List<LoanVehClearanceVehVo> selectListVo();
-
-	@Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
 
-	@Select("select * from loan_veh_clearance_veh where mainSid = #{sid}")
+    @Select("select * from loan_veh_clearance_veh where mainSid = #{sid}")
-	List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid);
+    List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.xml

@@ -3,11 +3,4 @@
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo">
-		SELECT * FROM loan_veh_clearance_veh <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo">
-		SELECT * FROM loan_veh_clearance_veh <where> ${ew.sqlSegment} </where>
-	</select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehRest.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVeh;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehQuery;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo;
@@ -41,60 +42,18 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetai
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceVehFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehRest <br/>
- * Description: 车辆远程解控车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆远程解控车辆")
-@RestController("com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehRest")
+@RestController
 @RequestMapping("v1/loanvehclearanceveh")
 public class LoanVehClearanceVehRest implements LoanVehClearanceVehFeign {
 
-	@Autowired
+    @Autowired
-	private LoanVehClearanceVehService loanVehClearanceVehService;
+    private LoanVehClearanceVehService loanVehClearanceVehService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanVehClearanceVehVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceVehQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanVehClearanceVehVo> pv = loanVehClearanceVehService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody LoanVehClearanceVehDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		loanVehClearanceVehService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		loanVehClearanceVehService.delBySids(sids);
-		return rb.success();
-	}
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    public ResultBean<List<LoanVehClearanceVehDetailsVo>> selByMainSid(String applySid) {
-    @GetMapping("/fetchDetailsBySid/{sid}")
+        ResultBean rb = ResultBean.fireFail();
-    public ResultBean<LoanVehClearanceVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+        List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVos = loanVehClearanceVehService.selByMainSid(applySid);
-		ResultBean rb = ResultBean.fireFail();
+        return rb.success().setData(loanVehClearanceVehDetailsVos);
-		LoanVehClearanceVehDetailsVo vo = loanVehClearanceVehService.fetchDetailsVoBySid(sid);
+    }
-		return rb.success().setData(vo);
-	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java

@@ -45,74 +45,39 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceVehService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService <br/>
- * Description: 车辆远程解控车辆 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanVehClearanceVehService extends MybatisBaseService<LoanVehClearanceVehMapper, LoanVehClearanceVeh> {
-	private QueryWrapper<LoanVehClearanceVeh> createQueryWrapper(LoanVehClearanceVehQuery query) {
+
-		// todo: 这里根据具体业务调整查询条件
+    public void saveOrUpdateDto(LoanVehClearanceVehDto dto) {
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<LoanVehClearanceVeh> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<LoanVehClearanceVehVo> listPageVo(PagerQuery<LoanVehClearanceVehQuery> pq) {
-		LoanVehClearanceVehQuery query = pq.getParams();
-		QueryWrapper<LoanVehClearanceVeh> qw = createQueryWrapper(query);
-		IPage<LoanVehClearanceVeh> page = PagerUtil.queryToPage(pq);
-		IPage<LoanVehClearanceVehVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<LoanVehClearanceVehVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(LoanVehClearanceVehDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
+            return;
-        } 
+        }
-		this.updateByDto(dto);
+        this.updateByDto(dto);
-	}
+    }
-	
+
-	public void insertByDto(LoanVehClearanceVehDto dto){
+    public void insertByDto(LoanVehClearanceVehDto dto) {
-		LoanVehClearanceVeh entity = new LoanVehClearanceVeh();
+        LoanVehClearanceVeh entity = new LoanVehClearanceVeh();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
+        baseMapper.insert(entity);
-	}
+    }
-	
+
-	public void updateByDto(LoanVehClearanceVehDto dto){
+    public void updateByDto(LoanVehClearanceVehDto dto) {
-          String dtoSid = dto.getSid();
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
+        }
-		LoanVehClearanceVeh entity = fetchBySid(dtoSid);
+        LoanVehClearanceVeh entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
+        baseMapper.updateById(entity);
-	}
+    }
-	
-	public LoanVehClearanceVehDetailsVo fetchDetailsVoBySid(String sid){
-		LoanVehClearanceVeh entity = fetchBySid(sid);
-		LoanVehClearanceVehDetailsVo vo = new LoanVehClearanceVehDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
 
-	public void delByMainSid(String dtoSid) {
+    public void delByMainSid(String dtoSid) {
-		baseMapper.delByMainSid(dtoSid);
+        baseMapper.delByMainSid(dtoSid);
-	}
+    }
 
-	public List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid) {
+    public List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid) {
-		return baseMapper.selByMainSid(sid);
+        return baseMapper.selByMainSid(sid);
-	}
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@@ -56,6 +56,11 @@ public interface ScmVehRebateFeign {
     @ResponseBody
     public ResultBean<List<ScmVehRebateVo>> listAll(@RequestBody ScmVehRebateQuery query);
 
+    @ApiOperation("统计")
+    @PostMapping("/statistics")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(@RequestBody PagerQuery<ScmVehRebateStatQuery> pq);
+
     @ApiOperation("单车返利未预提申请选择单车返利信息")
     @PostMapping("/withApplyGetVehRebate")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java

@@ -36,19 +36,6 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利) <br/>
- * File: ScmVehRebateFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeignFallback <br/>
- * Description: 单车返利表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-24 09:01:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 
@@ -63,6 +50,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(PagerQuery<ScmVehRebateStatQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
 		return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java → anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatQuery.java

@@ -23,45 +23,37 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+package com.yxt.anrui.scm.api.scmvehrebate;
-
+
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.query.Query;
-import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiModelProperty;
-import com.yxt.common.core.vo.PagerVo;
+import lombok.Data;
-import org.springframework.stereotype.Component;
+
-
+@Data
-@Component
+public class ScmVehRebateStatQuery implements Query {
-public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeign {
+
-
+    @ApiModelProperty("事业部")
-	@Override
+    private String division;
-	public ResultBean<PagerVo<LoanBeCollectionVehVo>> listPage(PagerQuery<LoanBeCollectionVehQuery> pq){
+    @ApiModelProperty("分公司")
-		ResultBean rb = ResultBean.fireFail();
+    private String useOrgName;
-		return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/listPage无法访问");
+    @ApiModelProperty("采购系统")
-	}
+    private String purchaseSystemName;
-
+    @ApiModelProperty("品牌名称")
-	@Override
+    private String brandName;
-	public ResultBean save(LoanBeCollectionVehDto dto){
+    @ApiModelProperty("车架号")
-		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/save无法访问");
+    private String vinNo;
-	}
+    @ApiModelProperty("车型名称")
-
+    private String vehModelName;
-	@Override
+
-	public ResultBean delBySids( String[] sids){
+    @ApiModelProperty("销售日期")
-		return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/delBySids无法访问");
+    private String saleDateStart;
-	}
+    private String saleDateEnd;
-
+    @ApiModelProperty("实销日期")
-	@Override
+    private String acSaleDateStart;
-	public ResultBean<LoanBeCollectionVehDetailsVo> fetchDetailsBySid(String sid){
+    private String acSaleDateEnd;
-		ResultBean rb = ResultBean.fireFail();
+
-		return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/fetchDetailsBySid无法访问");
+    private String userSid;
-	}
+    private String orgPath;
-
+    private String menuUrl;
-	@Override
+    private String menuSid;
-	public ResultBean<LoanBeCollectionVehDbrDetailsVo> initDbr(String saleVehSid) {
+}
-		return null;
-	}
-
-	@Override
-	public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) {
-		return null;
-	}
-}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatVo.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ScmVehRebateStatVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
+    @ApiModelProperty("车型名称")
+    private String vehModelName;
+    @ApiModelProperty("车辆sid")
+    private String vehSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("销售日期")
+    private String saleDate;
+    @ApiModelProperty("实销日期")
+    private String acSaleDate;
+
+    @ApiModelProperty("预计返利")
+    private BigDecimal estimateRebate;
+    @ApiModelProperty("上传金额")
+    private BigDecimal uploadMoney;
+    @ApiModelProperty("二次上传金额")
+    private BigDecimal secondaryUploadMoney;
+    @ApiModelProperty("待确定金额")
+    private BigDecimal stayDetermineMoney;
+    @ApiModelProperty("调整金额")
+    private BigDecimal adjustmentMoney;
+    @ApiModelProperty("未上传金额")
+    private BigDecimal notUploadMoney;
+
+    @ApiModelProperty("其中预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("其中费用")
+    private BigDecimal money;
+
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("事业部")
+    private String division;
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -35,24 +35,13 @@ import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利) <br/>
- * File: ScmVehRebateMapper.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateMapper <br/>
- * Description: 单车返利表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-24 09:01:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 
     IPage<ScmVehRebateVo> selectPageVo(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmVehRebate> qw);
 
+    IPage<ScmVehRebateStatVo> statistics(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
+
     IPage<ScmVehRebateVo> selectPageVoUpload(IPage<ScmVehRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
 
     @Update("update scm_veh_rebate set state = #{state} where sid = #{sid}")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -19,6 +19,10 @@
         </where>
     </select>
 
+    <select id="statistics" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatVo">
+
+    </select>
+
     <select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
         SELECT
         *,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -74,6 +74,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
         return rb.success().setData(scmVehRebateVoList);
     }
 
+    @Override
+    public ResultBean<PagerVo<ScmVehRebateStatVo>> statistics(PagerQuery<ScmVehRebateStatQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehRebateStatVo> pv = scmVehRebateService.statistics(pq);
+        return rb.success().setData(pv);
+    }
+
     @ApiOperation("导出")
     @PostMapping("/excelList")
     public void excelList(@RequestBody ScmVehRebateQuery query) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -353,6 +353,86 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         return scmVehRebateVoList;
     }
 
+    public PagerVo<ScmVehRebateStatVo> statistics(PagerQuery<ScmVehRebateStatQuery> pq) {
+        ScmVehRebateStatQuery query = pq.getParams();
+        QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            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("orgPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("orgPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("createBySid", query.getUserSid());
+                } else {
+                    PagerVo<ScmVehRebateStatVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<ScmVehRebateStatVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getDivision())) {
+            qw.like("division", query.getDivision());
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("useOrgName", query.getUseOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("purchaseSystemName", query.getPurchaseSystemName());
+        }
+        if (StringUtils.isNotBlank(query.getBrandName())) {
+            qw.like("brandName", query.getBrandName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getVehModelName())) {
+            qw.like("vehModelName", query.getVehModelName());
+        }
+
+
+        String saleDateStart = query.getSaleDateStart();
+        String saleDateEnd = query.getSaleDateEnd();
+        qw.apply(StringUtils.isNotBlank(saleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + saleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(saleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + saleDateEnd + "','%Y-%m-%d')"
+                );
+        String acSaleDateStart = query.getAcSaleDateStart();
+        String acSaleDateEnd = query.getAcSaleDateEnd();
+        qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
+                );
+        qw.orderByDesc("createTime");
+        IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehRebateStatVo> pagging = baseMapper.statistics(page, qw);
+        PagerVo<ScmVehRebateStatVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public PagerVo<ScmVehRebateVo> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
         ScmVehRebateQuery query = pq.getParams();
         QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/fileexamine/FileexamineFeign.java

@@ -33,19 +33,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
 @FeignClient(
         contextId = "terminal-Fileexamine",
@@ -63,7 +50,7 @@ public interface FileexamineFeign {
     @PostMapping("/saveLoanDataInfo")
     @ResponseBody
     public ResultBean save(@RequestBody FileexamineDto dto);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/getLoanDataInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineRest.java

@@ -25,29 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.risk.fileexamine;
 
-import com.yxt.anrui.riskcenter.api.loanfileexamine.*;
 import com.yxt.anrui.terminal.api.risk.fileexamine.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-/**
- * Project: anrui-riskcenter(放款资料审核) <br/>
- * File: LoanFileexamineFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanfileexamine.LoanFileexamineRest <br/>
- * Description: 放款资料审核. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-09-08 09:43:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "放款资料审核")
 @RestController
 @RequestMapping("riskcenter/v1/loanData")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/fileexamine/FileexamineService.java

@@ -54,6 +54,7 @@ public class FileexamineService {
         LoanFileexamineQuery params1 = new LoanFileexamineQuery();
         params1.setOrgSidPath(params.getOrgPath());
         params1.setUserSid(params.getUserSid());
+        params1.setMenuSid(params.getMenuSid());
         params1.setNames(params.getNames());
         params1.setType(params.getType());
         pq.setParams(params1);