yanderong
2026-06-17 9a40de1fbaf24310e4165ad2c6efd494f4eb592b
feat: 新增出行卡详情列表
6个文件已修改
107 ■■■■■ 已修改文件
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTravelCardController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TravelCardMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TravelCard.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITravelCardService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardPackageServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTravelCardController.java
@@ -74,6 +74,18 @@
        return ResultUtil.success(id);
    }
    /**
     * 获取出行卡包详情,卡列表
     */
    @RequestMapping(value = "/detailList")
    @ResponseBody
    public Object detailList(String packageId, String cardNo, String rechargeUserPhone, Integer status) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(travelCardService.getTravelCardList(page, packageId, cardNo, rechargeUserPhone, status));
        return super.packForBT(page);
    }
    /**
     *  导出出行卡信息
     */
@@ -83,7 +95,6 @@
        // 表格数据【封装】
        List<List<String>> dataList = new ArrayList<>();
        //第一行显示【封装】
        List<String> twoList = new ArrayList<String>();
        twoList.add("总计:");
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TravelCardMapper.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.TravelCard;
import org.apache.ibatis.annotations.Param;
@@ -14,4 +15,11 @@
    List<Map<String, Object>> getTravelCardByPackageId(@Param("packageId") Integer packageId);
    List<Map<String, Object>> getTravelCardList(@Param("page") Page<Map<String, Object>> page,
                                                @Param("packageId") String packageId,
                                                @Param("cardNo") String cardNo,
                                                @Param("rechargeUserPhone") String rechargeUserPhone,
                                                @Param("status") Integer status);
    Integer rechargeCount(@Param("packageId") Integer packageId, @Param("status") Integer status);
}
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TravelCard.xml
@@ -10,4 +10,34 @@
        select * from t_travel_card c where c.packageId = #{packageId}
    </select>
    <select id="getTravelCardList" resultType="java.util.Map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        select * from t_travel_card c
        <where>
            <if test="packageId != null">
               and c.packageId = #{packageId}
            </if>
            <if test="cardNo != null and cardNo != ''">
                and c.cardNo = #{cardNo}
            </if>
            <if test="rechargeUserPhone != null and rechargeUserPhone != ''">
                and c.rechargeUserPhone = #{rechargeUserPhone}
            </if>
            <if test="status != null">
                and c.status = #{status}
            </if>
        </where>
    </select>
    <select id="rechargeCount" resultType="java.lang.Integer">
        select count(*) from t_travel_card c
        <where>
            <if test="status != null">
                and c.status = #{status}
            </if>
            <if test="packageId != null">
                and c.packageId = #{packageId}
            </if>
        </where>
    </select>
</mapper>
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITravelCardService.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.TravelCard;
@@ -31,4 +32,24 @@
     * @return 出行卡列表
     */
    List<Map<String, Object>> getTravelCardByPackageId(Integer packageId);
    /**
     * 出行卡列表
     *
     * @param page 分页
     * @param packageId 包id
     * @param cardNo 卡号
     * @param rechargeUserPhone 充值用户手机
     * @param status 状态
     * @return 列表数据
     */
    List<Map<String, Object>> getTravelCardList(Page<Map<String, Object>> page, String packageId, String cardNo, String rechargeUserPhone, Integer status);
    /**
     * 查询已充值数量
     *
     * @param packageId 包ID
     * @return 充值数量
     */
    Integer rechargeCount(Integer packageId);
}
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardPackageServiceImpl.java
@@ -32,12 +32,19 @@
    /**
     * 获取出行卡包列表
     *
     * @param page 分页
     * @param name 卡包名称
     * @return 列表数据
     */
   public List<Map<String, Object>> getTravelCardPackageList(Page<Map<String, Object>> page, String name) {
       return this.baseMapper.getTravelCardPackageList(page, name);
       List<Map<String, Object>> dataList = this.baseMapper.getTravelCardPackageList(page, name);
       dataList.forEach(data -> {
           Integer packageId = Optional.ofNullable(data.get("id")).map(String::valueOf).map(Integer::parseInt).orElse(null);
           Integer recharge = Optional.ofNullable(travelCardService.rechargeCount(packageId)).orElse(0);
           data.put("rechargeCount", recharge);
       });
       return dataList;
    }
    /**
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardServiceImpl.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.common.constant.travelcard.TravelCardStatusEnum;
import com.stylefeng.guns.modular.system.dao.TravelCardMapper;
@@ -92,4 +93,29 @@
    public List<Map<String, Object>> getTravelCardByPackageId(Integer packageId) {
        return this.baseMapper.getTravelCardByPackageId(packageId);
    }
    /**
     * 出行卡列表
     *
     * @param page 分页
     * @param packageId 包id
     * @param cardNo 卡号
     * @param rechargeUserPhone 充值用户手机
     * @param status 状态
     * @return 列表数据
     */
    public List<Map<String, Object>> getTravelCardList(Page<Map<String, Object>> page, String packageId, String cardNo, String rechargeUserPhone, Integer status) {
        return this.baseMapper.getTravelCardList(page, packageId, cardNo, rechargeUserPhone, status);
    }
    /**
     * 查询已充值数量
     *
     * @param packageId 包ID
     * @return 充值数量
     */
    public Integer rechargeCount(Integer packageId) {
        return this.baseMapper.rechargeCount(packageId, TravelCardStatusEnum.RECHARGED.getCode());
    }
}