From 44ec2edf3a35ef4ab776e4c97f5d8e5741c0b12b Mon Sep 17 00:00:00 2001 From: zhangmei <645025773@qq.com> Date: 星期二, 11 二月 2025 14:25:46 +0800 Subject: [PATCH] 开票信息 --- ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceToBillQuery.java | 19 ++++++ ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceToBillController.java | 20 ++++++ ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java | 23 +++++++ ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml | 17 +++++ ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 10 +- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java | 33 +++++++++++ ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java | 40 +++++++++++++ ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceToBillMapper.java | 16 +++++ 8 files changed, 173 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java index 3ff9f05..0e57fff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java @@ -46,11 +46,11 @@ return R.ok(invoiceService.removeById(id)); } - @ApiOperation(value = "关联账单信息") - @GetMapping(value = "/getBillByInvoiceId") - public AjaxResult<List<TBill>> getBillByInvoiceId(String invoiceId){ - return AjaxResult.success(invoiceService.getBillByInvoiceId(invoiceId)); - } + // @ApiOperation(value = "关联账单信息") + // @GetMapping(value = "/getBillByInvoiceId") + // public AjaxResult<List<TBill>> getBillByInvoiceId(String invoiceId){ + // return AjaxResult.success(invoiceService.getBillByInvoiceId(invoiceId)); + // } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceToBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceToBillController.java new file mode 100644 index 0000000..697393d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceToBillController.java @@ -0,0 +1,20 @@ +package com.ruoyi.web.controller.api; + + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 账单开票中间表 前端控制器 + * </p> + * + * @author xiaochen + * @since 2025-02-10 + */ +@RestController +@RequestMapping("/t-invoice-to-bill") +public class TInvoiceToBillController { + +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceToBillMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceToBillMapper.java new file mode 100644 index 0000000..5e10748 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceToBillMapper.java @@ -0,0 +1,16 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.model.TInvoiceToBill; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 账单开票中间表 Mapper 接口 + * </p> + * + * @author xiaochen + * @since 2025-02-10 + */ +public interface TInvoiceToBillMapper extends BaseMapper<TInvoiceToBill> { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java new file mode 100644 index 0000000..9320378 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java @@ -0,0 +1,40 @@ +package com.ruoyi.system.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * <p> + * 账单开票中间表 + * </p> + * + * @author xiaochen + * @since 2025-02-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("t_invoice_to_bill") +@ApiModel(value="TInvoiceToBill对象", description="账单开票中间表") +public class TInvoiceToBill implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private String id; + + @ApiModelProperty(value = "开票id") + @TableField("invoice_id") + private String invoiceId; + + @ApiModelProperty(value = "账单id") + @TableField("bill_id") + private String billId; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceToBillQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceToBillQuery.java new file mode 100644 index 0000000..2faa6d3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceToBillQuery.java @@ -0,0 +1,19 @@ +package com.ruoyi.system.query; + +import com.ruoyi.common.core.domain.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +@Data +@ApiModel(value="开票查询列表Query") +public class TInvoiceToBillQuery extends BasePage { + @ApiModelProperty(value = "开票申请id") + private String invoiceId; + + @ApiModelProperty(value = "账单id") + private String billId; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java new file mode 100644 index 0000000..f20ee3d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java @@ -0,0 +1,23 @@ +package com.ruoyi.system.service; + +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.system.model.TInvoice; +import com.ruoyi.system.model.TInvoiceToBill; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.system.query.TInvoiceQuery; +import com.ruoyi.system.query.TInvoiceToBillQuery; + +import java.util.List; + +/** + * <p> + * 账单开票中间表 服务类 + * </p> + * + * @author xiaochen + * @since 2025-02-10 + */ +public interface TInvoiceToBillService extends IService<TInvoiceToBill> { + List<TInvoiceToBill> makeQuery(TInvoiceToBillQuery query); +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java new file mode 100644 index 0000000..e4658b3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java @@ -0,0 +1,33 @@ +package com.ruoyi.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.model.TInvoice; +import com.ruoyi.system.model.TInvoiceToBill; +import com.ruoyi.system.mapper.TInvoiceToBillMapper; +import com.ruoyi.system.query.TInvoiceToBillQuery; +import com.ruoyi.system.service.TInvoiceToBillService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * <p> + * 账单开票中间表 服务实现类 + * </p> + * + * @author xiaochen + * @since 2025-02-10 + */ +@Service +public class TInvoiceToBillServiceImpl extends ServiceImpl<TInvoiceToBillMapper, TInvoiceToBill> implements TInvoiceToBillService { + + @Override + public List<TInvoiceToBill> makeQuery(TInvoiceToBillQuery query) { + LambdaQueryWrapper<TInvoiceToBill> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(null != query.getInvoiceId(),TInvoiceToBill::getInvoiceId,query.getInvoiceId()) + .eq(null != query.getBillId(),TInvoiceToBill::getBillId,query.getBillId()); + return this.baseMapper.selectList(queryWrapper); + } +} diff --git a/ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml b/ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml new file mode 100644 index 0000000..fe804dc --- /dev/null +++ b/ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ruoyi.system.mapper.TInvoiceToBillMapper"> + + <!-- 通用查询映射结果 --> + <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TInvoiceToBill"> + <id column="id" property="id" /> + <result column="invoice_id" property="invoiceId" /> + <result column="bill_id" property="billId" /> + </resultMap> + + <!-- 通用查询结果列 --> + <sql id="Base_Column_List"> + id, invoice_id, bill_id + </sql> + +</mapper> -- Gitblit v1.7.1