From df6d4b614568568c4158d22868cb215958b2def5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 14:15:19 +0800
Subject: [PATCH] 水电费账单详情，开票中间表
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java | 16 ++
ruoyi-system/src/main/resources/mapper/system/TInvoiceToBillMapper.xml | 17 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillDetailController.java | 20 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java | 20 +++
ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java | 42 +++++++
ruoyi-system/src/main/resources/mapper/system/TBillDetailMapper.xml | 26 ++++
/dev/null | 28 ----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceToBillController.java | 20 +++
generator/src/test/java/com/xizang/CodeGeneratorTests.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillDetailService.java | 16 ++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillDetailMapper.java | 16 ++
ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java | 60 ++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceToBillMapper.java | 16 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillDetailServiceImpl.java | 20 +++
14 files changed, 290 insertions(+), 29 deletions(-)
diff --git a/generator/src/main/java/com/ruoyi/system/controller/TOrderBillController.java b/generator/src/main/java/com/ruoyi/system/controller/TOrderBillController.java
deleted file mode 100644
index 4dab479..0000000
--- a/generator/src/main/java/com/ruoyi/system/controller/TOrderBillController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.system.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 订单表与账单的关联表 前端控制器
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-@RestController
-@RequestMapping("/t-order-bill")
-public class TOrderBillController {
-
-}
-
diff --git a/generator/src/main/java/com/ruoyi/system/controller/TPayOrderController.java b/generator/src/main/java/com/ruoyi/system/controller/TPayOrderController.java
deleted file mode 100644
index 906d0c2..0000000
--- a/generator/src/main/java/com/ruoyi/system/controller/TPayOrderController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.system.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 支付订单表 前端控制器
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-@RestController
-@RequestMapping("/t-pay-order")
-public class TPayOrderController {
-
-}
-
diff --git a/generator/src/main/java/com/ruoyi/system/mapper/TOrderBillMapper.java b/generator/src/main/java/com/ruoyi/system/mapper/TOrderBillMapper.java
deleted file mode 100644
index b1ee709..0000000
--- a/generator/src/main/java/com/ruoyi/system/mapper/TOrderBillMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.ruoyi.system.model.TOrderBill;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 订单表与账单的关联表 Mapper 接口
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-public interface TOrderBillMapper extends BaseMapper<TOrderBill> {
-
-}
diff --git a/generator/src/main/java/com/ruoyi/system/mapper/TPayOrderMapper.java b/generator/src/main/java/com/ruoyi/system/mapper/TPayOrderMapper.java
deleted file mode 100644
index 99f5e6a..0000000
--- a/generator/src/main/java/com/ruoyi/system/mapper/TPayOrderMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.ruoyi.system.model.TPayOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 支付订单表 Mapper 接口
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-public interface TPayOrderMapper extends BaseMapper<TPayOrder> {
-
-}
diff --git a/generator/src/main/java/com/ruoyi/system/model/TOrderBill.java b/generator/src/main/java/com/ruoyi/system/model/TOrderBill.java
deleted file mode 100644
index 9c1bb9c..0000000
--- a/generator/src/main/java/com/ruoyi/system/model/TOrderBill.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ruoyi.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-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-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_order_bill")
-@ApiModel(value="TOrderBill对象", description="订单表与账单的关联表")
-public class TOrderBill implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId("id")
- private String id;
-
- @ApiModelProperty(value = "订单号")
- @TableField("order_no")
- private String orderNo;
-
- @ApiModelProperty(value = "账单编号")
- @TableField("bill_id")
- private String billId;
-
- @TableField("create_time")
- private LocalDateTime createTime;
-
- @TableField("update_time")
- private LocalDateTime updateTime;
-
-
-}
diff --git a/generator/src/main/java/com/ruoyi/system/model/TPayOrder.java b/generator/src/main/java/com/ruoyi/system/model/TPayOrder.java
deleted file mode 100644
index ea80bf8..0000000
--- a/generator/src/main/java/com/ruoyi/system/model/TPayOrder.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.ruoyi.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-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-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_pay_order")
-@ApiModel(value="TPayOrder对象", description="支付订单表")
-public class TPayOrder implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "订单号")
- @TableId("id")
- private String id;
-
- @ApiModelProperty(value = "发起支付的用户ID")
- @TableField("user_id")
- private String userId;
-
- @ApiModelProperty(value = "用户名称")
- @TableField("user_name")
- private String userName;
-
- @ApiModelProperty(value = "用户微信openid或支付宝userid")
- @TableField("open_id")
- private String openId;
-
- @ApiModelProperty(value = "用户手机号码")
- @TableField("phone")
- private String phone;
-
- @ApiModelProperty(value = "订单金额")
- @TableField("amount")
- private Long amount;
-
- @ApiModelProperty(value = "实付金额")
- @TableField("act_pay_amount")
- private Long actPayAmount;
-
- @ApiModelProperty(value = "支付时间")
- @TableField("pay_time")
- private LocalDateTime payTime;
-
- @ApiModelProperty(value = "支付方式")
- @TableField("pay_type")
- private String payType;
-
- @ApiModelProperty(value = "支付的回调信息")
- @TableField("pay_info")
- private String payInfo;
-
- @ApiModelProperty(value = "银行的支付流水编号")
- @TableField("pay_no")
- private String payNo;
-
- @ApiModelProperty(value = "支付的回调时间")
- @TableField("callback_time")
- private LocalDateTime callbackTime;
-
- @ApiModelProperty(value = "订单创建时间")
- @TableField("create_time")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "订单更新时间")
- @TableField("update_time")
- private LocalDateTime updateTime;
-
-
-}
diff --git a/generator/src/main/java/com/ruoyi/system/service/TOrderBillService.java b/generator/src/main/java/com/ruoyi/system/service/TOrderBillService.java
deleted file mode 100644
index 38df822..0000000
--- a/generator/src/main/java/com/ruoyi/system/service/TOrderBillService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.system.model.TOrderBill;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 订单表与账单的关联表 服务类
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-public interface TOrderBillService extends IService<TOrderBill> {
-
-}
diff --git a/generator/src/main/java/com/ruoyi/system/service/TPayOrderService.java b/generator/src/main/java/com/ruoyi/system/service/TPayOrderService.java
deleted file mode 100644
index eed48ac..0000000
--- a/generator/src/main/java/com/ruoyi/system/service/TPayOrderService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.service;
-
-import com.ruoyi.system.model.TPayOrder;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 支付订单表 服务类
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-public interface TPayOrderService extends IService<TPayOrder> {
-
-}
diff --git a/generator/src/main/java/com/ruoyi/system/service/impl/TOrderBillServiceImpl.java b/generator/src/main/java/com/ruoyi/system/service/impl/TOrderBillServiceImpl.java
deleted file mode 100644
index 5b67f76..0000000
--- a/generator/src/main/java/com/ruoyi/system/service/impl/TOrderBillServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.model.TOrderBill;
-import com.ruoyi.system.mapper.TOrderBillMapper;
-import com.ruoyi.system.service.TOrderBillService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 订单表与账单的关联表 服务实现类
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-@Service
-public class TOrderBillServiceImpl extends ServiceImpl<TOrderBillMapper, TOrderBill> implements TOrderBillService {
-
-}
diff --git a/generator/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java b/generator/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
deleted file mode 100644
index e7941bb..0000000
--- a/generator/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import com.ruoyi.system.model.TPayOrder;
-import com.ruoyi.system.mapper.TPayOrderMapper;
-import com.ruoyi.system.service.TPayOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 支付订单表 服务实现类
- * </p>
- *
- * @author xiaochen
- * @since 2025-02-07
- */
-@Service
-public class TPayOrderServiceImpl extends ServiceImpl<TPayOrderMapper, TPayOrder> implements TPayOrderService {
-
-}
diff --git a/generator/src/main/resources/mapping/TBankFlowMapper.xml b/generator/src/main/resources/mapping/TBankFlowMapper.xml
deleted file mode 100644
index 61d5859..0000000
--- a/generator/src/main/resources/mapping/TBankFlowMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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.TBankFlowMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBankFlow">
- <id column="id" property="id" />
- <result column="bank_serial_number" property="bankSerialNumber" />
- <result column="flow_money" property="flowMoney" />
- <result column="deduction_money" property="deductionMoney" />
- <result column="remaining_money" property="remainingMoney" />
- <result column="pay_time" property="payTime" />
- <result column="payer" property="payer" />
- <result column="flow_status" property="flowStatus" />
- <result column="pay_type" property="payType" />
- <result column="payment_bill_id" property="paymentBillId" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="create_by" property="createBy" />
- <result column="update_by" property="updateBy" />
- <result column="disabled" property="disabled" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, bank_serial_number, flow_money, deduction_money, remaining_money, pay_time, payer, flow_status, pay_type, payment_bill_id, create_time, update_time, create_by, update_by, disabled
- </sql>
-
-</mapper>
diff --git a/generator/src/main/resources/mapping/TOrderBillMapper.xml b/generator/src/main/resources/mapping/TOrderBillMapper.xml
deleted file mode 100644
index a0338ce..0000000
--- a/generator/src/main/resources/mapping/TOrderBillMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.TOrderBillMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TOrderBill">
- <id column="id" property="id" />
- <result column="order_no" property="orderNo" />
- <result column="bill_id" property="billId" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, order_no, bill_id, create_time, update_time
- </sql>
-
-</mapper>
diff --git a/generator/src/main/resources/mapping/TPayOrderMapper.xml b/generator/src/main/resources/mapping/TPayOrderMapper.xml
deleted file mode 100644
index 4f6a2e7..0000000
--- a/generator/src/main/resources/mapping/TPayOrderMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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.TPayOrderMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TPayOrder">
- <id column="id" property="id" />
- <result column="user_id" property="userId" />
- <result column="user_name" property="userName" />
- <result column="open_id" property="openId" />
- <result column="phone" property="phone" />
- <result column="amount" property="amount" />
- <result column="act_pay_amount" property="actPayAmount" />
- <result column="pay_time" property="payTime" />
- <result column="pay_type" property="payType" />
- <result column="pay_info" property="payInfo" />
- <result column="pay_no" property="payNo" />
- <result column="callback_time" property="callbackTime" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, user_id, user_name, open_id, phone, amount, act_pay_amount, pay_time, pay_type, pay_info, pay_no, callback_time, create_time, update_time
- </sql>
-
-</mapper>
diff --git a/generator/src/test/java/com/xizang/CodeGeneratorTests.java b/generator/src/test/java/com/xizang/CodeGeneratorTests.java
index eae6969..64dd914 100644
--- a/generator/src/test/java/com/xizang/CodeGeneratorTests.java
+++ b/generator/src/test/java/com/xizang/CodeGeneratorTests.java
@@ -35,7 +35,7 @@
// 全局配置
GlobalConfig gc = new GlobalConfig();
- String projectPath = "D:\\畅云\\项目\\xizangweb\\xizang\\generator";
+ String projectPath = "F:\\workSpace\\xizang\\generator";
gc.setOutputDir(projectPath + "/src/main/java")
.setAuthor("xiaochen")
.setMapperName("%sMapper")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillDetailController.java
new file mode 100644
index 0000000..f036960
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillDetailController.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-bill-detail")
+public class TBillDetailController {
+
+}
+
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/TBillDetailMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillDetailMapper.java
new file mode 100644
index 0000000..c56ac36
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillDetailMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TBillDetail;
+
+/**
+ * <p>
+ * 账单水电费子表 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-10
+ */
+public interface TBillDetailMapper extends BaseMapper<TBillDetail> {
+
+}
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..9325307
--- /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.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TInvoiceToBill;
+
+/**
+ * <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/TBillDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
new file mode 100644
index 0000000..80e8157
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
@@ -0,0 +1,60 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 账单水电费子表
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_bill_detail")
+@ApiModel(value="TBillDetail对象", description="账单水电费子表")
+public class TBillDetail extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "账单id")
+ @TableField("bill_id")
+ private String billId;
+
+ @ApiModelProperty(value = "初始读数")
+ @TableField("start_reading")
+ private BigDecimal startReading;
+
+ @ApiModelProperty(value = "结束读数")
+ @TableField("end_reading")
+ private BigDecimal endReading;
+
+ @ApiModelProperty(value = "使用量")
+ @TableField("usage_measure")
+ private BigDecimal usageMeasure;
+
+ @ApiModelProperty(value = "单价")
+ @TableField("unit_price")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty(value = "总金额")
+ @TableField("total_amount")
+ private BigDecimal totalAmount;
+
+}
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..4f5db5b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java
@@ -0,0 +1,42 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <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(value = "id", type = IdType.ASSIGN_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/service/TBillDetailService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillDetailService.java
new file mode 100644
index 0000000..36d0bed
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillDetailService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.model.TBillDetail;
+
+/**
+ * <p>
+ * 账单水电费子表 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-10
+ */
+public interface TBillDetailService extends IService<TBillDetail> {
+
+}
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..e87d9ad
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.model.TInvoiceToBill;
+
+/**
+ * <p>
+ * 账单开票中间表 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-10
+ */
+public interface TInvoiceToBillService extends IService<TInvoiceToBill> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillDetailServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillDetailServiceImpl.java
new file mode 100644
index 0000000..44e6404
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillDetailServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.mapper.TBillDetailMapper;
+import com.ruoyi.system.model.TBillDetail;
+import com.ruoyi.system.service.TBillDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 账单水电费子表 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-10
+ */
+@Service
+public class TBillDetailServiceImpl extends ServiceImpl<TBillDetailMapper, TBillDetail> implements TBillDetailService {
+
+}
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..61b05c2
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.mapper.TInvoiceToBillMapper;
+import com.ruoyi.system.model.TInvoiceToBill;
+import com.ruoyi.system.service.TInvoiceToBillService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 账单开票中间表 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-02-10
+ */
+@Service
+public class TInvoiceToBillServiceImpl extends ServiceImpl<TInvoiceToBillMapper, TInvoiceToBill> implements TInvoiceToBillService {
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillDetailMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillDetailMapper.xml
new file mode 100644
index 0000000..fd790b1
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillDetailMapper.xml
@@ -0,0 +1,26 @@
+<?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.TBillDetailMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBillDetail">
+ <id column="id" property="id" />
+ <result column="bill_id" property="billId" />
+ <result column="start_reading" property="startReading" />
+ <result column="end_reading" property="endReading" />
+ <result column="usage_measure" property="usageMeasure" />
+ <result column="unit_price" property="unitPrice" />
+ <result column="total_amount" property="totalAmount" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_by" property="createBy" />
+ <result column="update_by" property="updateBy" />
+ <result column="disabled" property="disabled" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, bill_id, start_reading, end_reading, usage_measure, unit_price, total_amount, create_time, update_time, create_by, update_by, disabled
+ </sql>
+
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInvoiceToBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInvoiceToBillMapper.xml
new file mode 100644
index 0000000..fe804dc
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/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