xuhy
2025-02-10 df6d4b614568568c4158d22868cb215958b2def5
水电费账单详情,开票中间表
13个文件已删除
1个文件已修改
12个文件已添加
646 ■■■■■ 已修改文件
generator/src/main/java/com/ruoyi/system/controller/TOrderBillController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/controller/TPayOrderController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/mapper/TOrderBillMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/mapper/TPayOrderMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/model/TOrderBill.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/model/TPayOrder.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/service/TOrderBillService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/service/TPayOrderService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/service/impl/TOrderBillServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/resources/mapping/TBankFlowMapper.xml 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/resources/mapping/TOrderBillMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/resources/mapping/TPayOrderMapper.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/test/java/com/xizang/CodeGeneratorTests.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillDetailController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceToBillController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillDetailMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceToBillMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillDetailService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillDetailServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TBillDetailMapper.xml 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TInvoiceToBillMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/main/java/com/ruoyi/system/controller/TOrderBillController.java
File was deleted
generator/src/main/java/com/ruoyi/system/controller/TPayOrderController.java
File was deleted
generator/src/main/java/com/ruoyi/system/mapper/TOrderBillMapper.java
File was deleted
generator/src/main/java/com/ruoyi/system/mapper/TPayOrderMapper.java
File was deleted
generator/src/main/java/com/ruoyi/system/model/TOrderBill.java
File was deleted
generator/src/main/java/com/ruoyi/system/model/TPayOrder.java
File was deleted
generator/src/main/java/com/ruoyi/system/service/TOrderBillService.java
File was deleted
generator/src/main/java/com/ruoyi/system/service/TPayOrderService.java
File was deleted
generator/src/main/java/com/ruoyi/system/service/impl/TOrderBillServiceImpl.java
File was deleted
generator/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
File was deleted
generator/src/main/resources/mapping/TBankFlowMapper.xml
File was deleted
generator/src/main/resources/mapping/TOrderBillMapper.xml
File was deleted
generator/src/main/resources/mapping/TPayOrderMapper.xml
File was deleted
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")
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillDetailController.java
New file
@@ -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 {
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceToBillController.java
New file
@@ -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 {
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillDetailMapper.java
New file
@@ -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> {
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInvoiceToBillMapper.java
New file
@@ -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> {
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TBillDetail.java
New file
@@ -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;
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoiceToBill.java
New file
@@ -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;
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillDetailService.java
New file
@@ -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> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java
New file
@@ -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> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillDetailServiceImpl.java
New file
@@ -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 {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java
New file
@@ -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 {
}
ruoyi-system/src/main/resources/mapper/system/TBillDetailMapper.xml
New file
@@ -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>
ruoyi-system/src/main/resources/mapper/system/TInvoiceToBillMapper.xml
New file
@@ -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>