新增历史结算;
新增租单管理
This commit is contained in:
109
src/main/java/com/gxwebsoft/tower/entity/TowerHistorySettle.java
Normal file
109
src/main/java/com/gxwebsoft/tower/entity/TowerHistorySettle.java
Normal file
@@ -0,0 +1,109 @@
|
||||
package com.gxwebsoft.tower.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import java.io.Serializable;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author 科技小王子
|
||||
* @since 2023-06-12 16:40:25
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value = "TowerHistorySettle对象", description = "")
|
||||
public class TowerHistorySettle implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "history_settle_id", type = IdType.AUTO)
|
||||
private Integer historySettleId;
|
||||
|
||||
@ApiModelProperty(value = "项目ID")
|
||||
private Integer projectId;
|
||||
|
||||
@ApiModelProperty(value = "合同编号")
|
||||
private String contractNo;
|
||||
|
||||
@ApiModelProperty(value = "设备")
|
||||
private Integer equipmentId;
|
||||
|
||||
@ApiModelProperty(value = "设备结算租金含税金额")
|
||||
private BigDecimal amountWithTax;
|
||||
|
||||
@ApiModelProperty(value = "设备结算租金税率")
|
||||
private BigDecimal taxAmount;
|
||||
|
||||
@ApiModelProperty(value = "进出场费含税金额")
|
||||
private BigDecimal inOutWithTax;
|
||||
|
||||
@ApiModelProperty(value = "进出场费税率")
|
||||
private BigDecimal inOutTax;
|
||||
|
||||
@ApiModelProperty(value = "劳务费含税金额")
|
||||
private BigDecimal workerAmountWithTax;
|
||||
|
||||
@ApiModelProperty(value = "劳务费税率")
|
||||
private BigDecimal workerTax;
|
||||
|
||||
@ApiModelProperty(value = "其他费用含税金额")
|
||||
private BigDecimal otherAmountWithTax;
|
||||
|
||||
@ApiModelProperty(value = "其他费用税率")
|
||||
private BigDecimal otherTax;
|
||||
|
||||
@ApiModelProperty(value = "开始日期")
|
||||
private String startDate;
|
||||
|
||||
@ApiModelProperty(value = "结束日期")
|
||||
private String endDate;
|
||||
|
||||
@ApiModelProperty(value = "用户ID")
|
||||
private Integer userId;
|
||||
|
||||
@ApiModelProperty(value = "是否删除, 0否, 1是")
|
||||
@TableLogic
|
||||
private Integer deleted;
|
||||
|
||||
@ApiModelProperty(value = "租户id")
|
||||
private Integer tenantId;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
@ApiModelProperty(value = "项目名称")
|
||||
@TableField(exist = false)
|
||||
private String projectName;
|
||||
|
||||
@ApiModelProperty(value = "设备名称")
|
||||
@TableField(exist = false)
|
||||
private String equipmentName;
|
||||
|
||||
@ApiModelProperty(value = "设备型号")
|
||||
@TableField(exist = false)
|
||||
private String equipmentModel;
|
||||
|
||||
@ApiModelProperty(value = "出厂编号")
|
||||
@TableField(exist = false)
|
||||
private String factoryNo;
|
||||
|
||||
@ApiModelProperty(value = "备案编号")
|
||||
@TableField(exist = false)
|
||||
private String filingNo;
|
||||
|
||||
@ApiModelProperty(value = "自编号")
|
||||
@TableField(exist = false)
|
||||
private String equipmentNo;
|
||||
|
||||
}
|
||||
114
src/main/java/com/gxwebsoft/tower/entity/TowerRentRecord.java
Normal file
114
src/main/java/com/gxwebsoft/tower/entity/TowerRentRecord.java
Normal file
@@ -0,0 +1,114 @@
|
||||
package com.gxwebsoft.tower.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 租单记录
|
||||
*
|
||||
* @author 科技小王子
|
||||
* @since 2023-06-13 00:42:42
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value = "TowerRentRecord对象", description = "租单记录")
|
||||
public class TowerRentRecord implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "租单记录id")
|
||||
@TableId(value = "rent_record_id", type = IdType.AUTO)
|
||||
private Integer rentRecordId;
|
||||
|
||||
@ApiModelProperty(value = "项目ID")
|
||||
private Integer projectId;
|
||||
|
||||
@ApiModelProperty(value = "合同编号")
|
||||
private String contractNo;
|
||||
|
||||
@ApiModelProperty(value = "设备ID")
|
||||
private Integer equipmentId;
|
||||
|
||||
@ApiModelProperty(value = "起租日期")
|
||||
private String startDate;
|
||||
|
||||
@ApiModelProperty(value = "停租日期")
|
||||
private String stopDate;
|
||||
|
||||
@ApiModelProperty(value = "检测日期")
|
||||
private String checkDate;
|
||||
|
||||
@ApiModelProperty(value = "报停日期")
|
||||
private String reportStopDate;
|
||||
|
||||
@ApiModelProperty(value = "报停类型")
|
||||
private String reportStopType;
|
||||
|
||||
@ApiModelProperty(value = "复工日期")
|
||||
private String restoreDate;
|
||||
|
||||
@ApiModelProperty(value = "报监编号")
|
||||
private String reportMonitorNo;
|
||||
|
||||
@ApiModelProperty(value = "承租单位")
|
||||
private Integer companyId;
|
||||
|
||||
@ApiModelProperty(value = "状态(0未起租1起租2中途报停3报停复工4拆卸停租)")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty(value = "所有人")
|
||||
private Integer userId;
|
||||
|
||||
@ApiModelProperty(value = "是否删除, 0否, 1是")
|
||||
@TableLogic
|
||||
private Integer deleted;
|
||||
|
||||
@ApiModelProperty(value = "租户id")
|
||||
private Integer tenantId;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
@ApiModelProperty(value = "项目名称")
|
||||
@TableField(exist = false)
|
||||
private String projectName;
|
||||
|
||||
@ApiModelProperty(value = "承租单位")
|
||||
@TableField(exist = false)
|
||||
private String companyName;
|
||||
|
||||
@ApiModelProperty(value = "设备名称")
|
||||
@TableField(exist = false)
|
||||
private String equipmentName;
|
||||
|
||||
@ApiModelProperty(value = "设备型号")
|
||||
@TableField(exist = false)
|
||||
private String equipmentModel;
|
||||
|
||||
@ApiModelProperty(value = "备案号")
|
||||
@TableField(exist = false)
|
||||
private String filingNo;
|
||||
|
||||
@ApiModelProperty(value = "自编号")
|
||||
@TableField(exist = false)
|
||||
private String equipmentNo;
|
||||
|
||||
@ApiModelProperty(value = "出厂编号")
|
||||
@TableField(exist = false)
|
||||
private String factoryNo;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user