修改问题

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

@@ -167,11 +167,19 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         qw.orderByDesc("bva.id");
         IPage<BusVehicleApply> page = PagerUtil.queryToPage(pq);
         IPage<BusVehicleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<BusVehicleApplyVo> busVehicleApplyVoList = pagging.getRecords();
+        busVehicleApplyVoList.removeAll(Collections.singleton(null));
+        if(!busVehicleApplyVoList.isEmpty()){
             for (BusVehicleApplyVo record : pagging.getRecords()) {
                 String orgDeptSid = record.getOrgDeptSid();
+                if(StringUtils.isNotBlank(orgDeptSid)){
                     BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(orgDeptSid).getData();
+                    if(basePurchaseSystemDetailsVo != null){
                         record.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
                     }
+                }
+            }
+        }
         PagerVo<BusVehicleApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -25,9 +25,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractVo">
         SELECT *
         FROM common_contract
-        <where>
-            ${ew.sqlSegment}
-        </where>
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectCountByTypeAndOrgAndCreateDate" resultType="int">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -199,6 +199,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         qw.apply(StringUtils.isNotEmpty(createDateStart), "date_format (createDate,'%Y-%m-%d') >= date_format('" + createDateStart + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(createDateEnd), "date_format (createDate,'%Y-%m-%d') <= date_format('" + createDateEnd + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("id");
         return qw;
     }
 

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

@@ -34,11 +34,9 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
-import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
 import com.yxt.anrui.base.api.commonappendix.*;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
@@ -97,6 +95,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Project: anrui-fin(销售相关) <br/>
@@ -1190,7 +1189,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             qw.notIn("sid", params.getSidList());
         }
         qw.ne("currentReceivableMoney", 0);//应收金额
-        List<String> vinNoList = new ArrayList<>();
+       /* List<String> vinNoList = new ArrayList<>();
         List<BaseVehicleTempstateVo> baseVehicleTempstateVos = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()).getData();
         for (BaseVehicleTempstateVo baseVehicleTempstateVo : baseVehicleTempstateVos) {
             String vehSid = baseVehicleTempstateVo.getVehSid();
@@ -1201,6 +1200,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         if (vinNoList.size() > 0) {
             qw.notIn("VIN", vinNoList);
+        }*/
+        ResultBean<List<BaseVehicleTempstate>> baseVehicleTempstateFeignList = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
+        List<BaseVehicleTempstate> baseVehicleTempstates = baseVehicleTempstateFeignList.getData();
+        if (baseVehicleTempstates.size() > 0) {
+            List<String> stringList = baseVehicleTempstates.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList());
+            List<String> sidsList = getList(stringList, userSid, useOrgSid);
+            if (sidsList.size() > 0) {
+                //查询该申请下是否存在款项明细
+                List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedService.getList(sidsList);
+                List<String> strings = finSelectedReceivablesDetaileds.stream().map(v -> v.getReceivablesSid()).distinct().collect(Collectors.toList());
+                if (strings.size() > 0) {
+                    qw.notIn("sid", strings);
+                }
+            }
         }
         if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
             qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
@@ -1224,7 +1237,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
 //        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
         List<AppFinUncollectedReceivablesDetailedVo> collList = finSelectedReceivablesDetailedService.getPaymentList(qw,params.getName());
-//        List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
+        if(collList.isEmpty()){
+            collList = finSelectedReceivablesDetailedService.getPaymentList(qw,"");
             for (AppFinUncollectedReceivablesDetailedVo record : collList) {
                 record.setConfirmDate(dateFormat.format(new Date()));
                 String busVinSid = record.getBusVinSid();
@@ -1246,6 +1260,50 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             if(StringUtils.isNotBlank(pagerQuery.getParams().getName())){
                 collList = collList.stream().filter(v->v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
             }
+        }else{
+            for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+                record.setConfirmDate(dateFormat.format(new Date()));
+                String busVinSid = record.getBusVinSid();
+                ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
+                if (resultBean.getData() != null) {
+                    String vinNo = resultBean.getData().getLinkNo();
+                    String vinSid = resultBean.getData().getLinkSid();
+                    String temporaryNo = resultBean.getData().getTemporaryNo();
+                    record.setVin(vinNo);
+                    if (StringUtils.isNotBlank(vinNo)) {
+                        record.setVin(vinNo.substring(vinNo.length() - 8));
+                    } else {
+                        if ("2".equals(record.getPayTypeKey())) {
+                            record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                        }
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(pagerQuery.getParams().getName())){
+                List<AppFinUncollectedReceivablesDetailedVo> cll = collList.stream().filter(v->v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
+                collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList());
+            }
+        }
+//        List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
+     /*   for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+            record.setConfirmDate(dateFormat.format(new Date()));
+            String busVinSid = record.getBusVinSid();
+            ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
+            if (resultBean.getData() != null) {
+                String vinNo = resultBean.getData().getLinkNo();
+                String vinSid = resultBean.getData().getLinkSid();
+                String temporaryNo = resultBean.getData().getTemporaryNo();
+                record.setVin(vinNo);
+                if (StringUtils.isNotBlank(vinNo)) {
+                    record.setVin(vinNo.substring(vinNo.length() - 8));
+                } else {
+                    if ("2".equals(record.getPayTypeKey())) {
+                        record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                    }
+                }
+            }
+        }*/
+
         //分页
         IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>();
         page1.setRecords(collList);