Merge remote-tracking branch 'origin/master'

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

@@ -239,4 +239,10 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     CrmCustomerTemp selectCrm(String affiliatedOrgSid);
 
     String selectByMcSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
+
+    String selectByBusSid1(String sid);
+
+    String selectByBusSid1D(String sid);
+
+    String selectByBusVinSid1(String sid);
 }

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

@@ -636,4 +636,48 @@
     <select id="selectByMcSid" resultType="java.lang.String">
         select sid from anrui_base.base_vehmodel_config where useOrgSid = #{useOrgSid} and modelSid = #{modelSid} and configurationItemsSid = #{configSid} order by id desc limit 1
     </select>
+
+    <select id="selectByBusSid1" resultType="java.lang.String">
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
+        from (SELECT
+        cast((
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) ) AS DECIMAL(10, 2)) AS dbalance
+        FROM anrui_fin.fin_selected_receivables_detailed d
+        left join anrui_fin.fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
+        LEFT JOIN (
+        SELECT f.busSid,
+        f.thisUseMoney
+        FROM anrui_fin.fin_funds_carried_forward_veh f
+        JOIN anrui_fin.fin_funds_carried_forward_apply fa ON f.mainSid = fa.sid
+        WHERE fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE d.auditState = 3
+        and ff.busVinSid = #{busVinSid} and ff.receivablesName = '首付款及费用'
+        GROUP BY d.`sid`) d
+    </select>
+
+    <select id="selectByBusSid1D" resultType="java.lang.String">
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
+        from (SELECT
+        cast((
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) ) AS DECIMAL(10, 2)) AS dbalance
+        FROM anrui_fin.fin_selected_receivables_detailed d
+        left join anrui_fin.fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
+        LEFT JOIN (
+        SELECT f.busSid,
+        f.thisUseMoney
+        FROM anrui_fin.fin_funds_carried_forward_veh f
+        JOIN anrui_fin.fin_funds_carried_forward_apply fa ON f.mainSid = fa.sid
+        WHERE fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE d.auditState = 3
+        and ff.busVinSid = #{busVinSid} and ff.receivablesName = '订金'
+        GROUP BY d.`sid`) d
+    </select>
+
+    <select id="selectByBusVinSid1" resultType="java.lang.String">
+        select ifnull(sum(reveivableMoney),0)
+        from anrui_fin.fin_uncollected_receivables_detailed
+        where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金')
+    </select>
 </mapper>

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

@@ -5841,10 +5841,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         dtoList.add(baseVehicleStateDto);
                     }*/
                     //已认款完成
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                   /* BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
                     baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
                     baseVehicleStateDto.setBusSid(vinList.get(i).getSid());
-                    dtoList.add(baseVehicleStateDto);
+                    dtoList.add(baseVehicleStateDto);*/
+                    String subscribute = baseMapper.selectByBusSid1(vinList.get(i).getSid());
+                    String subscributeD = baseMapper.selectByBusSid1D(vinList.get(i).getSid());
+                    String receiableMoney = baseMapper.selectByBusVinSid1(vinList.get(i).getSid());
+                    BigDecimal subscributeAll = new BigDecimal(subscribute).add(new BigDecimal(subscributeD));
+                    if (subscributeAll.compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(vinList.get(i).getSid());
+                        dtoList.add(baseVehicleStateDto);
+                    }
                 }
             }
             //==============================修改车辆的持久状态组装数据

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

@@ -3786,16 +3786,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         if (v.getReceivablesName().equals("月还")) {
                             if (null != planDetails.getPaymentMoney()) {
                                 if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) {
+                                    BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                    String subscriptionMoney = v.getSubscriptionMoney();
+                                    BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                    planDetails.setPaymentMoney(subtract);
+                                    loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
                                     String orderSid = planDetails.getSalesOrderSid();
                                     ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid);
                                     if (bankResultBean.getData() != null) {
                                         LoanFinBank loanFinBank = bankResultBean.getData();
                                         if (null != loanFinBank.getReAdvances()) {
-                                            BigDecimal paymentMoney = planDetails.getPaymentMoney();
-                                            String subscriptionMoney = v.getSubscriptionMoney();
-                                            BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
-                                            planDetails.setPaymentMoney(subtract);
-                                            loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
                                             if (loanFinBank.getReAdvances() == 1) {
                                                 FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
                                                 jr.setCreateBySid(userSid);
@@ -3823,19 +3823,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         if (v.getReceivablesName().equals("资方逾期利息")) {
                             if (null != planDetails.getPaymentInterest()) {
                                 if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) {
+                                    BigDecimal paymentInterest = planDetails.getPaymentInterest();
+                                    String subscriptionMoney = v.getSubscriptionMoney();
+                                    BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
+                                    planDetails.setPaymentInterest(subtract);
+                                    BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                    BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                    planDetails.setPaymentMoney(subtract2);
+                                    loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
                                     String orderSid = planDetails.getSalesOrderSid();
                                     ResultBean<LoanFinBank> bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid);
                                     if (bankResultBean.getData() != null) {
                                         LoanFinBank loanFinBank = bankResultBean.getData();
                                         if (null != loanFinBank.getReAdvances()) {
-                                            BigDecimal paymentInterest = planDetails.getPaymentInterest();
-                                            String subscriptionMoney = v.getSubscriptionMoney();
-                                            BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
-                                            planDetails.setPaymentInterest(subtract);
-                                            BigDecimal paymentMoney = planDetails.getPaymentMoney();
-                                            BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
-                                            planDetails.setPaymentMoney(subtract2);
-                                            loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
                                             if (loanFinBank.getReAdvances() == 1) {
                                                 FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
                                                 jr.setCreateBySid(userSid);
@@ -3893,19 +3893,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
                             stringList.removeAll(Collections.singleton(null));
                             BigDecimal a3 = BigDecimal.ZERO;
-                            if(!stringList.isEmpty()){
+                            if (!stringList.isEmpty()) {
                                 a3 = baseMapper.selectA3(stringList);
                             }
                             unall = unall.add(a1).add(a3);
                             List<String> unList = baseMapper.selectUnA(busVinSid);
                             unList.removeAll(Collections.singleton(null));
                             BigDecimal a4 = BigDecimal.ZERO;
-                            if(!unList.isEmpty()){
+                            if (!unList.isEmpty()) {
                                 //已收
                                 a4 = baseMapper.selectA4(unList);
                             }
                             BigDecimal a5 = BigDecimal.ZERO;
-                            if(!stringList.isEmpty()){
+                            if (!stringList.isEmpty()) {
                                 a5 = baseMapper.selectA5(stringList);
                             }
 
@@ -3919,7 +3919,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             List<String> stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid());
                             stringList.removeAll(Collections.singleton(null));
                             BigDecimal a3 = BigDecimal.ZERO;
-                            if(!stringList.isEmpty()){
+                            if (!stringList.isEmpty()) {
                                 a3 = baseMapper.selectA3(stringList);
                             }
                             BigDecimal a1 = baseMapper.selectA1(busVinSid);
@@ -3928,12 +3928,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             //已收
                             unList.removeAll(Collections.singleton(null));
                             BigDecimal a4 = BigDecimal.ZERO;
-                            if(!unList.isEmpty()){
+                            if (!unList.isEmpty()) {
                                 //已收
                                 a4 = baseMapper.selectA4(unList);
                             }
                             BigDecimal a5 = BigDecimal.ZERO;
-                            if(!stringList.isEmpty()){
+                            if (!stringList.isEmpty()) {
                                 a5 = baseMapper.selectA5(stringList);
                             }
                             yAll = yAll.add(a4).add(a5);
@@ -4317,23 +4317,30 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     voucherDetail.setCustomerCode(customerNumber);
                     voucherDetail.setCustomerName(customerName);
                 }
-                if (v.getReceivablesName().equals("资方逾期利息")) {
-                    //间还已逾期
-                    voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
-                } else {
-                    LoanRepaymentPlanDetailsForOverDue checkOverdue = loanRepaymentPlanDetailsFeign.checkOverDue(planSid).getData();
-                    if (checkOverdue != null) {
-                        if (StringUtils.isNotBlank(checkOverdue.getOverdueState())) {
-                            if (checkOverdue.getOverdueState().equals("0")) {
-                                //间还已逾期
-                                voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
-                            } else if (checkOverdue.getOverdueState().equals("1")) {
-                                //间还未逾期
-                                voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER1.getCode());
-                            }
-                        }
+                if (null !=planDetails.getOweState()){
+                    if (planDetails.getOweState() == 0) {
+                        voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
+                    } else if (planDetails.getOweState() == 1) {
+                        voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER1.getCode());
                     }
                 }
+//                if (v.getReceivablesName().equals("资方逾期利息")) {
+//                    //间还已逾期
+//                    voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
+//                } else {
+//                    LoanRepaymentPlanDetailsForOverDue checkOverdue = loanRepaymentPlanDetailsFeign.checkOverDue(planSid).getData();
+//                    if (checkOverdue != null) {
+//                        if (StringUtils.isNotBlank(checkOverdue.getOverdueState())) {
+//                            if (checkOverdue.getOverdueState().equals("0")) {
+//                                //间还已逾期
+//                                voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER2.getCode());
+//                            } else if (checkOverdue.getOverdueState().equals("1")) {
+//                                //间还未逾期
+//                                voucherDetail.setSceneCode(SceneCodeEnum.INDIRECT_VOUCHER1.getCode());
+//                            }
+//                        }
+//                    }
+//                }
                 try {
                     voucherDetail.setDataTime(sdf.parse(finCollectionConfirmation.getCollectionDate()));
                 } catch (ParseException e) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -1621,7 +1621,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             for (FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos) {
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
                 if("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())){
-                    String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                  /*  String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
                     String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
                     if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
                         //已认款完成
@@ -1635,6 +1635,23 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
                         baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
                         dtoList.add(baseVehicleStateDto);
+                    }*/
+                    String subscribute = baseMapper.selectByBusSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String subscributeD = baseMapper.selectByBusSid1D(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
+                    BigDecimal subscributeAll = new BigDecimal(subscribute).add(new BigDecimal(subscributeD));
+                    if (subscributeAll.compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    } else {
+                        //认款未完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
                     }
                 }else{
                     //查询该车的所有认款，是否都已认完

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -325,7 +325,7 @@
     <select id="selectByBusVinSid1" resultType="java.lang.String">
         select ifnull(sum(reveivableMoney),0)
         from fin_uncollected_receivables_detailed
-        where busVinSid = #{busVinSid} and receivablesName = '首付款及费用'
+        where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金')
     </select>
 
     <select id="selectListByBusVinSid"
@@ -335,7 +335,7 @@
 
     <select id="selectListByBusVinSid1"
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
-        select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid} and receivablesName = '首付款及费用'
+        select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid} and (receivablesName = '首付款及费用' or receivablesName = '订金')
     </select>
 
     <select id="selectListByBusVinSid2"

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml

@@ -184,7 +184,7 @@
         )),
         0
         ) < p.dueMoney
-        AND p.dueDate < last_day(curdate())
+        AND p.dueDate < last_day(date_sub(now(),interval -1 month))
         AND s.purchaseSystemSid = #{purchaseSystemSid}
         AND s.useOrgSid = #{userOrgSid}
         UNION ALL
@@ -319,7 +319,7 @@
         )),
         0
         ) < p.dueMoney
-        AND p.dueDate < last_day(curdate())
+        AND p.dueDate < last_day(date_sub(now(),interval -1 month))
         AND s.purchaseSystemSid = #{purchaseSystemSid}
         AND s.useOrgSid = #{userOrgSid}
         UNION ALL

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/ReturnExcelInfo.java

@@ -14,5 +14,6 @@ import java.util.List;
 public class ReturnExcelInfo {
     private String checkInfo;
     private String checkInfo2;
+    private String checkInfo3;
     private List<RepaymentExcelInfo> infos = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -63,4 +63,8 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     List<String> selNotRuleForBuckSids(@Param("useOrgSid") String useOrgSid);
 
     String selPayStateByPlanSid(@Param("key") String key);
+
+    List<String> selSidsForBuckle(@Param("useOrgSid") String useOrgSid);
+
+    int setBuckleState(@Param("sids")List<String> sids,@Param("buckleKey") String buckleKey,@Param("buckle") String buckle);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -9,7 +9,15 @@
             #{sid}
         </foreach>
     </update>
-
+    <update id="setBuckleState">
+        update loan_repayment_history
+        set buckleKey = #{buckleKey},
+        buckle =#{buckle}
+        where sid in
+        <foreach item="sid" collection="sids" open="(" separator="," close=")">
+            #{sid}
+        </foreach>
+    </update>
 
 
     <select id="updateRecordInfo"
@@ -556,5 +564,38 @@
             h.updateTime DESC
             LIMIT 1
     </select>
+    <select id="selSidsForBuckle" resultType="java.lang.String">
+        SELECT DISTINCT
+            b.sid
+        FROM
+            (
+                SELECT
+                    his.*,
+                    a.*
+                FROM
+                    loan_repayment_history AS his
+                        LEFT JOIN loan_repayment_plan_details as p ON his.planDetailSid = p.sid
+                        LEFT JOIN (
+                        SELECT
+                            h.planDetailSid AS ppp,
+                            IFNULL( SUM( h.actualMoney ), 0 ) AS sumActualMoney
+                        FROM
+                            loan_repayment_history AS h
+                        WHERE
+                            buckleKey != '002'
+        AND buckleKey != '003'
+        AND updateState = 1
+                        GROUP BY
+                            h.planDetailSid
+                    ) a ON his.planDetailSid = a.ppp
+                WHERE
+                    his.buckleKey != '002'
+        AND his.buckleKey != '003'
+        AND his.updateState = 1
+        AND p.useOrgSid = #{useOrgSid}
+            ) AS b
+        WHERE
+            sumActualMoney = 0
+    </select>
 
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -168,8 +168,16 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             int size = resultList.size();
             if (StringUtils.isNotBlank(importReturn.getCheckInfo2())) {
                 return rb.success().setData(resultList).setMsg(importReturn.getCheckInfo2());
+            } else if (StringUtils.isNotBlank(importReturn.getCheckInfo3())) {
+                String checkInfo3 = importReturn.getCheckInfo3();
+                String[] split = checkInfo3.split("-");
+                Integer i = Integer.valueOf(split[0]);
+                int i1 = i.intValue();
+                int i2 = size - i1;
+                String sBankNo = split[1];
+                return rb.success().setData(resultList).setMsg("共" + size + "条记录，成功导入" + i2 + "条，导入未成功的资方合同号为：" + sBankNo + "。导入点击“确定”，不导入点击”取消“。");
             } else {
-                return rb.success().setData(resultList).setMsg("数据校验成功，请点击“确定”按钮，导入数据。");
+                return rb.success().setData(resultList).setMsg("数据校验成功共" + size + "条记录，导入点击“确定”，不导入点击”取消“。");
             }
         } else {
             String checkResult = importReturn.getCheckInfo();
@@ -185,6 +193,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         int[] resultIndex = new int[resultCell.length];
         Set<String> checkWord = new HashSet<>();
         Set<String> checkWord2 = new HashSet<>();
+        Set<String> checkWord3 = new HashSet<>();
         for (int r = 1; r <= sheet.getLastRowNum(); r++) {
             Row row = sheet.getRow(r);
             if (row == null) {
@@ -253,7 +262,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             importVoList.add(importVo);
         }
         StringBuffer sbBankCNo = new StringBuffer();
-
+        int i = 0;
         if (!importVoList.isEmpty()) {
             for (RepaymentExcelInfo excelInfo : importVoList) {
                 if (StringUtils.isBlank(excelInfo.getRealReturnTime()) ||
@@ -286,6 +295,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     List<LoanRepaymentPlanDetails> planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(bankContractNo, period);
                     if (planDetails.isEmpty() || planDetails == null) {
                         sbBankCNo.append(bankContractNo).append("、");
+                        i++;
                     }
                 }
                 if (StringUtils.isNotBlank(excelInfo.getBankContractNo()) && StringUtils.isNotBlank(excelInfo.getRealReturnTime())) {
@@ -294,18 +304,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     if (!realReturnTime.equals("error")) {
                         List<LoanRepaymentHistory> histories = baseMapper.selByBankNoAndActDate(bankContractNo, realReturnTime);
                         if (!histories.isEmpty() || histories.size() > 0) {
-                            checkWord2.add("实还日期:" + realReturnTime + "、资方合同编号:" + bankContractNo);
+                            checkWord2.add(bankContractNo + "(" + realReturnTime + ")");
                         }
                     }
                 }
             }
         }
-        String bankCo = "";
-        if (sbBankCNo.length() > 0) {
-            sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
-            bankCo = "资方合同号" + sbBankCNo + "不存在";
-        }
-        checkWord.add(bankCo);
+//        String bankCo = "";
+//        if (sbBankCNo.length() > 0) {
+//            sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
+//            bankCo = "资方合同号" + sbBankCNo + "不存在";
+//        }
+//        checkWord.add(bankCo);
         StringBuffer sbcheck1 = new StringBuffer();
         if (!checkWord.isEmpty()) {
             for (String s : checkWord) {
@@ -332,10 +342,20 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             }
         }
         if (sbcheck2.length() > 0) {
-            sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length());
-            importReturn.setCheckInfo2("已存在" + sbcheck2.toString() + "的记录，是否继续导入，导入点击“确定”，不导入点击”取消“。");
+            if (sbBankCNo.length() > 0) {
+                sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
+                sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length());
+                importReturn.setCheckInfo2("1.平台中不存在的资方编号：" + sbBankCNo + "。2.平台中已存在资方实还日期记录：" + sbcheck2 + "。是否继续导入，导入点击“确定”，不导入点击”取消“。导入时只有系统中存在的资方合同号的记录才导入系统。");
+            } else {
+                sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length());
+                importReturn.setCheckInfo2("平台中已存在资方实还日期记录：" + sbcheck2 + "。是否继续导入，导入点击“确定”，不导入点击”取消“。");
+            }
             return importReturn;
         }
+        if (sbBankCNo.length() > 0) {
+            sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
+            importReturn.setCheckInfo3(i + "-" + sbBankCNo);
+        }
         return importReturn;
     }
 
@@ -802,8 +822,14 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     }
                 }
             }
-        } else {
-            return rb.setMsg("暂无可更新的还款记录");
+        }
+        //直还+转付余额为零的设置默认划扣状态已通过
+        List<String> hisSidsForBuckle = baseMapper.selSidsForBuckle(pushUseOrgSid);
+        if (!hisSidsForBuckle.isEmpty()) {
+            int i = baseMapper.setBuckleState(hisSidsForBuckle, "003", "审核通过");
+        }
+        if (histories.isEmpty() && hisSidsForBuckle.isEmpty()) {
+            return rb.setMsg("暂无可更新的数据");
         }
         return rb.success();
     }

doc/databases/统计报表更新.sql

@@ -78,7 +78,10 @@ BEGIN
                      where (si.nodeState != '已办结' and si.nodeState != '终止')
                        and bo.isDelete <> 1
                        and bo.applyTypeKey = '001'
-                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
+                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo  LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                                          WHERE LENGTH(bb.nodeState) > 0
+                                            AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                                          group by bbbbo.linkSid)
                      group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
                      union all
                      select ifnull(sum(bo.platformNo), 0) as scount,
@@ -93,7 +96,11 @@ BEGIN
                      where bo.isDelete <> 1
                        and LENGTH(offlineDate) = 0
                        and bo.orderStatus != '已作废'
-                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
+                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo
+                                                                        LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                                          WHERE LENGTH(bb.nodeState) > 0
+                                            AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                                          group by bbbbo.linkSid)
                      group by bo.createOrgSid, bd.vehicleSid, bd.configSid
                      union all
                      select ifnull(si.num, 0) as scount,
@@ -136,12 +143,36 @@ BEGIN
                          FROM anrui_buscenter.bus_sales_vehicle_order bbbbo
                                   LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
                          WHERE LENGTH(bb.nodeState) > 0
-                           AND bb.nodeState != '终止'
+                           AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
                          group by bbbbo.linkSid
                      ) ab ON ab.linkSid = bo.sid
                      WHERE (si.nodeState != '已办结' AND si.nodeState != '终止')
                        AND bo.isDelete <> 1
                      group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
+                     UNION ALL
+                     SELECT
+                         bo.useOrgSid,
+                         bd.vehicleSid modelSid,
+                         bd.configSid,
+                         bo.sid,
+                         ifnull(ab.counts, 0) as scount
+                     FROM
+                         anrui_base.bus_vehicle_order bo
+                             LEFT JOIN anrui_base.bus_vehicle_apply_detail bd ON bd.sid = bo.purchaseApplyMediumModelSid
+                             LEFT JOIN anrui_base.base_vehicle_model bbm ON bbm.sid = bd.vehicleSid
+                             LEFT JOIN (
+                             SELECT bbbbo.linkSid,
+                                    ifnull(count(bbbbo.linkSid), 0) as counts
+                             FROM anrui_buscenter.bus_sales_vehicle_order bbbbo
+                                      LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                             WHERE LENGTH(bb.nodeState) > 0
+                               AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                             group by bbbbo.linkSid
+                         ) ab ON ab.linkSid = bo.sid
+                     WHERE
+                             bo.isDelete <> 1
+                       AND LENGTH( offlineDate ) = 0
+                       AND bo.orderStatus != '已作废' group by bo.createOrgSid,bd.vehicleSid,bd.configSid
                  ) as v
             GROUP BY v.`useOrgSid`,
                      v.`modelSid`,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@@ -45,5 +45,11 @@ public class AsBusrepairInventorybillRest {
         return asBusrepairInventorybillService.outBill(dto);
     }
 
+    @PostMapping("quitBill")
+    @ApiOperation("退库")
+    ResultBean quitBill(@RequestBody AsBusrepairInventorybillDto dto){
+        return asBusrepairInventorybillService.quitBill(dto);
+    }
+
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -80,8 +80,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                 asBusrepairInventorybillDetailService.saveOrUpdateDetail(detailList, sid);
             }
             String orgPath = dto.getOrgPath();
-            if(StringUtils.isNotBlank(orgPath)){
-               String useOrgSid =sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            if (StringUtils.isNotBlank(orgPath)) {
+                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
                 asBusrepairInventorybill.setCreateOrgSid(useOrgSid);
                 asBusrepairInventorybill.setUseOrgSid(useOrgSid);
             }
@@ -107,15 +107,32 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
         String sid = saveOrUdateBill(dto).getData();
         AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid);
         WmsInventoryBillDto wmsInventoryBillDto = new WmsInventoryBillDto();
-        BeanUtil.copyProperties(asBusrepairInventorybill,wmsInventoryBillDto,"sid","id");
+        BeanUtil.copyProperties(asBusrepairInventorybill, wmsInventoryBillDto, "sid", "id");
         List<WmsInventoryBillDetailDto> wmsInventoryBillDetailDtos = new ArrayList<>();
         List<AsBusrepairInventorybillDetail> list = asBusrepairInventorybillDetailService.selectByMainSid(sid);
         list.removeAll(Collections.singleton(null));
-        if(!list.isEmpty()){
+        if (!list.isEmpty()) {
             wmsInventoryBillDetailDtos = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsInventoryBillDetailDto.class)).collect(Collectors.toList());
             wmsInventoryBillDto.setWmsInventoryBillDetailDtos(wmsInventoryBillDetailDtos);
         }
         wmsInventoryBillFeign.outStorage(wmsInventoryBillDto);
         return rb.success();
     }
+
+    public ResultBean quitBill(AsBusrepairInventorybillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = saveOrUdateBill(dto).getData();
+        AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid);
+        WmsInventoryBillDto wmsInventoryBillDto = new WmsInventoryBillDto();
+        BeanUtil.copyProperties(asBusrepairInventorybill, wmsInventoryBillDto, "sid", "id");
+        List<WmsInventoryBillDetailDto> wmsInventoryBillDetailDtos = new ArrayList<>();
+        List<AsBusrepairInventorybillDetail> list = asBusrepairInventorybillDetailService.selectByMainSid(sid);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            wmsInventoryBillDetailDtos = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsInventoryBillDetailDto.class)).collect(Collectors.toList());
+            wmsInventoryBillDto.setWmsInventoryBillDetailDtos(wmsInventoryBillDetailDtos);
+        }
+        wmsInventoryBillFeign.inStorage(wmsInventoryBillDto);
+        return rb.success();
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsinventorybill/WmsInventoryBillFeign.java

@@ -21,4 +21,8 @@ public interface WmsInventoryBillFeign {
     @ApiOperation("出库")
     @PostMapping("/outStorage")
     public ResultBean outStorage(@RequestBody WmsInventoryBillDto dto);
+
+    @ApiOperation("入库")
+    @PostMapping("/inStorage")
+    public ResultBean inStorage(@RequestBody WmsInventoryBillDto dto);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsinventorybill/WmsInventoryBillFeignFallback.java

@@ -14,4 +14,9 @@ public class WmsInventoryBillFeignFallback implements WmsInventoryBillFeign {
     public ResultBean outStorage(WmsInventoryBillDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean inStorage(WmsInventoryBillDto dto) {
+        return null;
+    }
 }