Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -111,4 +111,10 @@ public interface BusSalesOrderVehicleFeign {
     ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSid(@RequestParam("sid") String sid);
 
 
+    @ApiOperation("根据车架号模糊查车辆信息")
+    @PostMapping("/selectListByvinNo")
+    @ResponseBody
+    ResultBean<String> selectListByvinNo(@RequestParam("vinNo") String vinNo);
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -103,4 +103,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<String> selectListByvinNo(String vinNo) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -132,4 +132,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
      * @return
      */
     List<String> selectByVinSidAndContractNo(@Param("list") List<String> vinSidList, @Param("contractNo") String contractId);
+
+    String selectListByvinNo(@Param("vinNo") String vinNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -69,7 +69,8 @@
 
     <update id="updateTemporaryNo">
         update bus_sales_order_vehicle
-        set temporaryNo = #{temporaryNo},temporaryName = #{temporaryName}
+        set temporaryNo   = #{temporaryNo},
+            temporaryName = #{temporaryName}
         where sid = #{sid}
     </update>
 
@@ -82,7 +83,7 @@
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_sales_order_vehicle bv
-                     left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractNo}
           and bv.linkSid = #{vinSid}
     </select>
@@ -91,7 +92,7 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_delivered bd
-                     left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
+                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
         where bd.contractNo = #{contractNo}
           and bd.state = 1
           and length(bv.linkSid) > 0
@@ -149,4 +150,9 @@
             #{item}
         </foreach>
     </select>
+    <select id="selectListByvinNo" resultType="java.lang.String">
+        select sid
+        from bus_sales_order_vehicle
+        WHERE `linkNo` LIKE "%"#{vinNo}"%"
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -117,4 +117,9 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSid(String sid) {
         return busSalesOrderVehicleService.selectByBusSid(sid);
     }
+
+    @Override
+    public ResultBean<String> selectListByvinNo(String vinNo) {
+        return busSalesOrderVehicleService.selectListByvinNo(vinNo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -490,4 +490,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<String> selectByVinSidAndContractNo(List<String> vinSidList, String contractId) {
         return baseMapper.selectByVinSidAndContractNo(vinSidList,contractId);
     }
+
+    public ResultBean<String> selectListByvinNo(String vinNo) {
+        ResultBean rb = ResultBean.fireFail();
+      String sid = baseMapper.selectListByvinNo(vinNo);
+        return rb.success().setData(sid);
+    }
 }

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

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

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

@@ -331,25 +331,25 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("bsov.linkNo", query.getVinNo());
+            qw.eq("busVinSid", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getContractNo())) {
-            qw.like("furd.contractNo", query.getContractNo());
+            qw.like("contractNo", query.getContractNo());
         }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.like("furd.customerName", query.getCustomerName());
+            qw.like("customerName", query.getCustomerName());
         }
         if (StringUtils.isNotBlank(query.getReceivablesName())) {
-            qw.like("furd.receivablesName", query.getReceivablesName());
+            qw.like("receivablesName", query.getReceivablesName());
         }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
-        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.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.eq("furd.useOrgSid", query.getUseOrgSid());
-        qw.eq("furd.isDelete", "0");
-        qw.orderByDesc("furd.createTime");
+        qw.eq("useOrgSid", query.getUseOrgSid());
+        qw.eq("isDelete", "0");
+        qw.orderByDesc("createTime");
         return qw;
     }
 
@@ -357,6 +357,11 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         //   Map<String, Boolean> dict = new HashMap<>();
         //==============================分页开始====================================
         FinUncollectedReceivablesDetailedQuery params = pq.getParams();
+        //车架号查询
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            String busVinSid = busSalesOrderVehicleFeign.selectListByvinNo(params.getVinNo()).getData();
+            params.setVinNo(busVinSid);
+        }
         String orgPath = params.getOrgPath();
         String orgSidPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         params.setUseOrgSid(orgSidPath);