客户账单明细车架号查询问题

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

@@ -10,7 +10,8 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
         SELECT
         *
-        from fin_uncollected_receivables_detailed
+        from fin_uncollected_receivables_detailed as furd
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as bsov on furd.busVinSid = bsov.sid
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -329,23 +329,26 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
     private QueryWrapper<FinUncollectedReceivablesDetailed> myCreateQueryWrapper(FinUncollectedReceivablesDetailedQuery query) {
         QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
 
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bsov.linkNo", query.getVinNo());
+        }
         if (StringUtils.isNotBlank(query.getContractNo())) {
-            qw.like("contractNo", query.getContractNo());
+            qw.like("furd.contractNo", query.getContractNo());
         }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.like("customerName", query.getCustomerName());
+            qw.like("furd.customerName", query.getCustomerName());
         }
         if (StringUtils.isNotBlank(query.getReceivablesName())) {
-            qw.like("receivablesName", query.getReceivablesName());
+            qw.like("furd.receivablesName", query.getReceivablesName());
         }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
-        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (furd.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndTime), "date_format (furd.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("useOrgSid", query.getUseOrgSid());
-        qw.eq("isDelete", "0");
-        qw.orderByDesc("createTime");
+        qw.eq("furd.useOrgSid", query.getUseOrgSid());
+        qw.eq("furd.isDelete", "0");
+        qw.orderByDesc("furd.createTime");
         return qw;
     }