添加查询车队、用户接口，修改财务查询列表缺少字段

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java

@@ -47,9 +47,17 @@ public class TCorpsController extends BaseController {
     /**
      * 车队使用，查询客户、司机信息
      */
-    @GetMapping("/selectCorpList/{fId}")
-    public List<TCorps> selectCustomerDriverList (@PathVariable("fId") Long fId) {
-        return tCorpsService.selectCustomerDriverList(fId);
+    @GetMapping(value = "/selectCustomerDriverList")
+    public List<TCorps> selectCustomerDriverList (TCorps tCorps) {
+        return tCorpsService.selectCustomerDriverList(tCorps);
+    }
+
+    /**
+     * 车队使用，查询客户、司机信息
+     */
+    @GetMapping(value = "/selectCorpList/{fId}")
+    public List<TCorps> selectCorpList (@PathVariable("fId") Long fId) {
+        return tCorpsService.selectCorpList(fId);
     }
 
     /**

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsMapper.xml

@@ -316,7 +316,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test=" fToCorpid != null  and  fToCorpid != ''">and w.f_corpid = #{ fToCorpid} </if>
             <if test=" fMblno != null  and  fMblno != ''">and w.f_mblno  like concat('%', #{ fMblno}, '%') </if>
             <if test=" fStatementNo != null and  fStatementNo != ''">and w.f_statement_no  like concat('%', #{ fStatementNo}, '%') </if>
-
             <if test=' fReconciliation != null and  fReconciliation != "" and  fReconciliation == "1" '>
                 and w.f_accamount_date IS NOT NULL
             </if>
@@ -367,8 +366,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.f_name AS fCorpidName,
             f.f_accbilldate AS fAccbilldate,
             f.t_mblno AS tMblno,
-            f.amt AS fAmtdr,
+            f.charging_method AS chargingMethod,
+            f.f_amtdr AS fAmtdr,
+            f.f_amtcr AS fAmtcr,
+            f.bank AS bank,
             f.f_billtype AS fBilltype,
+            f.invoice_no AS invoiceNo,
+            f.create_time AS createTime,
+            f.water_bill_no AS waterBillNo,
+            f.f_system_type AS fSystemType,
             CASE
             WHEN  f.f_billstatus = '1' THEN '保存'
             WHEN  f.f_billstatus = '2' THEN '暂存'

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -603,6 +603,7 @@
             t.load_attn AS tLoadAttn,
             t.load_attntel AS tLoadAttntel,
             c.mblno,
+            c.driver_user_id AS driverUserId,
             c.driverbonus,
             g.f_name AS goodsId,
             c.order_status AS orderStatus,

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillsplansMapper.xml

@@ -102,7 +102,6 @@
             LEFT JOIN sys_dict_data prop ON prop.dict_type = 'data_transProp'
             AND prop.dict_value = f.trans_prop
             LEFT JOIN t_corps m ON m.f_id = plan.carcor_pid
-            AND m.f_typeid = '["4"]'
             LEFT JOIN t_corps c ON c.f_id = f.corp_id
             LEFT JOIN sys_user p ON p.user_id = f.plan_user_id
             LEFT JOIN sys_user a ON a.user_id = f.trans_user_id

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java

@@ -109,5 +109,12 @@ public interface TCorpsMapper extends BaseMapper<TCorps> {
      * @param fId
      * @return
      */
-    public List<TCorps> selectCustomerDriverList(Long fId);
+    public List<TCorps> selectCorpList(Long fId);
+
+    /**
+     *  车队使用，查询客户、车队信息
+     * @return
+     * @param tCorps
+     */
+    public List<TCorps> selectCustomerDriverList(TCorps tCorps);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java

@@ -99,5 +99,12 @@ public interface ITCorpsService {
      * @param fId
      * @return
      */
-    public List<TCorps> selectCustomerDriverList(Long fId);
+    public List<TCorps> selectCorpList(Long fId);
+
+    /**
+     *  车队使用，查询客户、车队信息
+     * @return
+     * @param tCorps
+     */
+    public List<TCorps> selectCustomerDriverList(TCorps tCorps);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -82,8 +82,18 @@ public class TCorpsServiceImpl implements ITCorpsService {
      * @return
      */
     @Override
-    public List<TCorps> selectCustomerDriverList(Long fId) {
-        return tCorpsMapper.selectCustomerDriverList(fId);
+    public List<TCorps> selectCorpList(Long fId) {
+        return tCorpsMapper.selectCorpList(fId);
+    }
+
+    /**
+     *  车队使用，查询客户、车队信息
+     * @param tCorps
+     * @return
+     */
+    @Override
+    public List<TCorps> selectCustomerDriverList(TCorps tCorps) {
+        return tCorpsMapper.selectCustomerDriverList(tCorps);
     }
 
     /**

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -129,7 +129,7 @@
         where f_id = #{fId}
     </select>
 
-    <select id="selectCustomerDriverList" parameterType="long" resultMap="TCorpsResult">
+    <select id="selectCorpList" parameterType="long" resultMap="TCorpsResult">
         SELECT
             c.f_id,
             c.f_pid,
@@ -145,6 +145,23 @@
             OR car.id = #{fId}
     </select>
 
+    <select id="selectCustomerDriverList" parameterType="TCorps" resultMap="TCorpsResult">
+        SELECT
+            c.f_id,
+            c.f_pid,
+            c.f_typeid,
+            c.f_no,
+            c.f_name
+        FROM
+            t_corps c
+            LEFT JOIN F_TMSORDERBILLSCARS car ON car.driver_tel = c.f_tel
+        <where>
+            c.f_typeid != '[\"102\"]'
+            and c.f_status = '0'
+            <if test="fName != null  and fName != ''"> and c.f_name like concat('%', #{fName}, '%')</if>
+        </where>
+    </select>
+
     <select id="selectFleetDriverMsgListMap" parameterType="TCorps" resultType="Map">
         SELECT
             c.f_id AS id,