修改数据库表明

ruoyi-fleet/src/main/resources/mapper/basicData/FleetCarManageMapper.xml

@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectFleetCarManageIdNameList" resultType="FleetCarManage" resultMap="FleetCarManageResult">
-        select id, fleet_company_id, car_num, car_name, driver_id from fleet_car_manage
+        select id, fleet_company_id, car_num, car_name, driver_id, driver_name, driver_tel from fleet_car_manage
         <where>
             <if test="fleetCompanyId != null "> and fleet_company_id = #{fleetCompanyId}</if>
             <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</if>

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

@@ -204,10 +204,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.load_date AS loadDate,
             t.un_load_date AS unLoadDate
         FROM
-            f_tmsorderbillsfees w
+            F_TMSORDERBILLSFEES w
             LEFT JOIN t_fees f ON w.f_feeid = f.f_id
             LEFT JOIN t_corps AS c ON w.f_corpid = c.f_id
-            LEFT JOIN f_tmsorderbills AS t ON w.org_id = t.id
+            LEFT JOIN F_TMSORDERBILLS AS t ON w.org_id = t.id
             LEFT JOIN t_corps AS c1 ON t.corp_id = c1.f_id
             LEFT JOIN sys_dict_data dict ON dict.dict_value = t.bill_type
         <where>
@@ -341,7 +341,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             GROUP BY  w.f_id
         </where>
     </select>
-    <select id="selectFTmsaccbillsMapList" resultType="java.util.Map">
+
+    <select id="selectFTmsaccbillsMapList" parameterType="FTmsaccbills" resultType="java.util.Map">
         SELECT
             f.id AS fId,
             f.bill_no AS fBillno,
@@ -356,15 +357,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f.remarks AS fRemarks,
             f.create_by AS createBy
         FROM
-            f_tmsaccbills f
+            F_TMSACCBILLS f
             LEFT JOIN t_corps AS c ON f.corp_id = c.f_id
         <where>
-            <if test="accYear != null "> and f.acc_year = #{accYear}</if>
-            <if test="accMonth != null "> and f.acc_month = #{accMonth}</if>
             <if test="actId != null "> and f.act_id = #{actId}</if>
             <if test="billNo != null  and billNo != ''"> and f.bill_no = #{billNo}</if>
             <if test="corpId != null "> and f.corp_id = #{corpId}</if>
-            <if test="transactId != null "> and f.transact_id = #{transactId}</if>
             <if test="fromDate != null "> and f.from_date = #{fromDate}</if>
             <if test="toDate != null "> and f.to_date = #{toDate}</if>
             <if test="amt != null "> and f.amt = #{amt}</if>
@@ -372,7 +370,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="postDate != null "> and f.post_date = #{postDate}</if>
             <if test="billStatus != null "> and f.bill_status = #{billStatus}</if>
             <if test="remarks != null  and remarks != ''"> and f.remarks = #{remarks}</if>
-            <if test="fBilltype != null  and fBilltype != ''">and f.f_billtype = #{fBilltype}</if>
         </where>
     </select>
 </mapper>

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -45,9 +45,7 @@ public class TokenService {
 //    private int wechatExpireTime;
 
     // 后续完善
-    private static int wechatExpireTime = 7;
-
-    protected static final int DAY = 86400000;
+    private static int wechatExpireTime = 10080;
 
     protected static final long MILLIS_SECOND = 1000;
 
@@ -161,9 +159,8 @@ public class TokenService {
      * @param loginUser 登录信息
      */
     public void wechatRefreshToken(LoginUser loginUser) {
-        wechatExpireTime = wechatExpireTime * DAY;
         loginUser.setLoginTime(System.currentTimeMillis());
-        loginUser.setExpireTime(loginUser.getLoginTime() + wechatExpireTime);
+        loginUser.setExpireTime(loginUser.getLoginTime() + wechatExpireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
         System.out.println("微信Token有效时间(s)：" + wechatExpireTime);