优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -1332,9 +1332,17 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = new ArrayList<>();
         if (StringUtils.isBlank(search)) {
-            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey);
+            if ("02".equals(invoiceKey)){
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid2(useOrgSid, invoiceKey);
+            }else {
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(useOrgSid);
+            }
         } else {
-            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
+            if ("02".equals(search)){
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid2(useOrgSid, search, invoiceKey);
+            }else {
+                finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid(useOrgSid, search);
+            }
         }
         List<AppDisAndCustm> appDisAndCustms = new ArrayList<>();
         for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -90,6 +90,11 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo(@PathVariable("contractNo") String contractNo);
 
+    @ApiOperation("根据合同编号查询金融方案开票价")
+    @GetMapping("/fetchByContractNo2/{contractNo}")
+    @ResponseBody
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(@PathVariable("contractNo") String contractNo);
+
     @ApiOperation("根据sid获取一条数据")
     @GetMapping("/fetchBySid/{sid}")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -81,6 +81,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(String contractNo) {
+        return null;
+    }
+
     @Override
     public ResultBean<BusSalesOrder> fetchBySid(String sid) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -222,4 +222,5 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     String selectBySid(String sid);
 
+    String selKpj(String contractNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -507,15 +507,15 @@
     </select>
 
     <select id="selectBusinessSid" resultType="java.lang.String">
-       <!-- select distinct bo.sid
-        from bus_sales_order bo
-        left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
-        left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid
-        <where>
-            ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
-            and ls.typeKey = '02'
-            and length(bv.linkSid)>0
-        </where>-->
+        <!-- select distinct bo.sid
+         from bus_sales_order bo
+         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+         left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid
+         <where>
+             ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
+             and ls.typeKey = '02'
+             and length(bv.linkSid)>0
+         </where>-->
         SELECT DISTINCT
         bo.sid
         FROM
@@ -581,4 +581,12 @@
                      left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo
         where bo.sid = #{sid}
     </select>
+
+    <select id="selKpj" resultType="java.lang.String">
+        SELECT ls.mainVehicleAmount
+        FROM bus_sales_order bo
+                     JOIN anrui_riskcenter.`loan_solutions` ls
+                ON bo.sid = ls.`salesOrderSid`
+        WHERE bo.`contractNo` = #{contractNo}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -119,6 +119,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.fetchByContractNo(contractNo);
     }
 
+    @Override
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(String contractNo) {
+        return busSalesOrderService.fetchByContractNo2(contractNo);
+    }
+
     @Override
     public ResultBean<BusSalesOrder> fetchBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2278,7 +2278,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (busSalesOrder == null) {
                     return rb.setMsg("该销售订单不存在");
                 }
-                if(!busSalesOrder.getPayTypeKey().equals(dto.getPayTypeKey())){
+                if (!busSalesOrder.getPayTypeKey().equals(dto.getPayTypeKey())) {
                     isTrue = true;
                 }
                 BeanUtil.copyProperties(dto, busSalesOrder, "sid");
@@ -5623,7 +5623,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setKxState("01");
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                 //==========================================================
-                if(new BigDecimal(money).compareTo(BigDecimal.ZERO) == 0){//首付款及费用若为0
+                if (new BigDecimal(money).compareTo(BigDecimal.ZERO) == 0) {//首付款及费用若为0
                     //判断认款是否已认完，若已认完，则更新车辆状态为交清。
 
                 }
@@ -5921,7 +5921,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
             baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             for (int i = 0; i < busSalesOrderVehicleDetailsVos.size(); i++) {
-                if(StringUtils.isBlank(list.get(i).getPos())){
+                if (StringUtils.isBlank(list.get(i).getPos())) {
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderVehicleDetailsVos.get(i).getSid());
                     busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
                     busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
@@ -5934,8 +5934,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
                     dtoList.add(baseVehicleStateDto);
-                }else{
-                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectBySidAndOrderBo(dto.getSaleOrderSid(),list.get(i).getPos());
+                } else {
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectBySidAndOrderBo(dto.getSaleOrderSid(), list.get(i).getPos());
                     busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
                     busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
                     busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
@@ -6886,6 +6886,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setData(busSalesOrderIsDTKPJVo);
     }
 
+    public ResultBean<BusSalesOrderIsDTKPJVo> fetchByContractNo2(String contractNo) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
+        String kpj = baseMapper.selKpj(contractNo);
+        busSalesOrderIsDTKPJVo.setIsEdit(true);
+        busSalesOrderIsDTKPJVo.setOneBillMoney(kpj);
+        return rb.success().setData(busSalesOrderIsDTKPJVo);
+    }
+
 
     public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
         ResultBean rb = ResultBean.fireFail();
@@ -7330,7 +7339,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<VinListVo2> vinList = new ArrayList<>();
 //        int pos = 0;
         String pos = "";
-        if(borrowSidList.size()>0){
+        if (borrowSidList.size() > 0) {
             for (int j = 0; j < borrowSidList.size(); j++) {
                 VinListVo2 vinListVo2 = new VinListVo2();
                 String borrowSid = borrowSidList.get(j);
@@ -7490,8 +7499,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (list.size() > 0) {
             for (int i = 0; i < vins.size(); i++) {
                 String busVinSid = vins.get(i);
-                BusSalesOrderVehicle busSalesOrderVehicle =busSalesOrderVehicleService.fetchBySid(busVinSid);
-                if(StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())){
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid);
+                if (StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())) {
                     busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
                     busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName());
                     busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
@@ -7524,8 +7533,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         String customerSid = busSalesOrder.getCustomerSid();
         LoanPreloanCreditApply loanPreloanCreditApply = busSalesOrderBorrowerService.selectLoanApply(customerSid);
-        if(loanPreloanCreditApply != null){
-            if(!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())){
+        if (loanPreloanCreditApply != null) {
+            if (!"001".equals(loanPreloanCreditApply.getZffkjgKey()) && !"003".equals(loanPreloanCreditApply.getZffkjgKey())) {
                 return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
             }
         }
@@ -7549,4 +7558,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<SalesLenderVo> lenderVoResultBean = saleOrderInputLender(saleOrderSid);
         return lenderVoResultBean;
     }
+
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.fin.biz.fincompanyinvoicing;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum;
@@ -58,6 +59,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -444,6 +446,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", orgSid);
         qw.eq("isDelete", 0);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -453,6 +457,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
         qw.eq("invoiceTypeKey",invoiceKey);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -463,6 +469,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         qw.eq("isDelete", 0);
         qw.eq("invoiceTypeKey",invoiceKey);
         qw.like("name", search);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -472,6 +480,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
         qw.like("name", search);
+        qw.isNotNull("effectiveDate");
+        qw.ge("effectiveDate", DateUtil.formatDate(new Date()));
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java

@@ -106,5 +106,10 @@ public class FlowableFallback implements FlowableFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<Map<String, Object>> getMapQKKP(FlowProcessMapQuery query) {
+        return null;
+    }
+
 
 }